Jean Chalard
0013f97ddd
am 5906b05b
: am 7058b02a
: Extract a new class for app-specific workarounds.
...
* commit '5906b05bb50c0a67bd4f03fcfae41db3daefe0bc':
Extract a new class for app-specific workarounds.
2013-05-20 19:50:46 -07:00
Tadashi G. Takaoka
2532f72b94
Remove unnecessary @UsedForTesting annotation
...
Change-Id: I843fd6bc20da95e61d1a05b5b34d6e4c9db59dab
2013-05-21 10:45:59 +09:00
Jean Chalard
89fe1f5088
Add a method to work around apps broken by recorrection
...
Bug: 8944307
Change-Id: I8986622554f30aaf4f595099c4ab5652b75c972c
2013-05-21 07:53:31 +09:00
Jean Chalard
7058b02a9c
Extract a new class for app-specific workarounds.
...
Bug: 8944307
Change-Id: Iaff9dd03d3d856a6bdaa2b16c4e71e95cd2b6349
2013-05-21 07:53:28 +09:00
Kurt Partridge
500dea6ad4
Fix punctuation logging
...
Punctuation is currently put into the same LogUnit as the
following word. This is counter-intuitive and makes
post-processing more complicated.
This change causes punctuation to be put into its own
LogUnit.
A tricky case is the phantom space. A phantom space is
inserted right before other text, whose MotionEvents have
already been collected and inserted into mCurrentLogBuffer.
Phantom spaces are handled by creating their own LogUnit and
inserting it into the LogBuffer right before
mCurrentLogBuffer is shifted in.
Change-Id: I102d7cd93982ad37ba0abb6c1ac0f66b85b5f95d
2013-05-17 09:47:40 -07:00
Kurt Partridge
17b63ba588
Merge "Remove unnecessary commit/uncommit"
2013-05-15 23:52:43 +00:00
Kurt Partridge
7af5300c7d
Merge "Add claifying comment"
2013-05-15 23:31:31 +00:00
Jean Chalard
b1e37e4a47
am f1dcf725
: Merge "Don\'t process recorrection or resets when not shown"
...
* commit 'f1dcf725061b3e61e40540566a5385cf4934f424':
Don't process recorrection or resets when not shown
2013-05-15 07:58:27 -07:00
Tadashi G. Takaoka
25f0c8089e
am 96a9f357
: Merge "Fix unintentional setup step advance in orientation change"
...
* commit '96a9f357c7e2a059687926cd7cd52ac5d06bc65e':
Fix unintentional setup step advance in orientation change
2013-05-15 07:58:18 -07:00
Tadashi G. Takaoka
7fe675440e
am 769427cf
: Adjust aspect ratio of setup image
...
* commit '769427cff24944958f5f1f6179090a86444f3eab':
Adjust aspect ratio of setup image
2013-05-15 07:57:38 -07:00
Jean Chalard
f1dcf72506
Merge "Don't process recorrection or resets when not shown"
2013-05-15 11:25:25 +00:00
Jean Chalard
c9aaba1253
Don't process recorrection or resets when not shown
...
Bug: 8954116
Change-Id: Ica27dbfc570643bb81e6cdf34cc7c796ea080d71
2013-05-15 20:20:20 +09:00
Tadashi G. Takaoka
9b4a883e09
Fix unintentional setup step advance in orientation change
...
Bug: 8159728
Change-Id: I53e7d7c8fb5cc231ea94474b091e550f77ae8dab
2013-05-15 19:50:35 +09:00
Tadashi G. Takaoka
769427cff2
Adjust aspect ratio of setup image
...
Bug: 8159728
Change-Id: I578014912fa63c4c9b4c2c89aeae7ffec836b06c
2013-05-15 14:48:27 +09:00
Kurt Partridge
993acbaaa2
Remove unnecessary commit/uncommit
...
When the user reverts a commit, this causes the committed
word to be changed. The user usually then goes back to edit
that word. Going back to edit causes an uncommit, so that
the editing actions are added onto the LogUnit containing
the operations used to construct the word.
But currently, reverting also involves its own
commit/uncommit pair, with the caller performing the
uncommit, and the commit happening inside the revert
command. This may have been necessary in the past, when
revert was called in different situations, but is
unnecessary now. Furthermore, the guarding conditions are
currently such that the uncommit doesn't always undo the
effects of the commit, corrupting the log output.
Change-Id: I74af41f4f1db2fcabfa496dcc4a2d7bd0af19b3a
2013-05-14 12:20:27 -07:00
Kurt Partridge
7b0a148951
Merge "Rename a var to match semantics"
2013-05-14 16:11:07 +00:00
Kurt Partridge
3e8df13cd7
Add claifying comment
...
This is a follow-up to I7c01c3dd3ac33d7e96c00836256bae9c14b124ed
Change-Id: I9e3f8968c4bbf9525d5dfe101f71373c42f88361
2013-05-14 09:10:22 -07:00
Kurt Partridge
b2d53be740
Merge "Remove FeedbackLog instance variables."
2013-05-14 13:09:33 +00:00
Tadashi G. Takaoka
8b56ad7814
Merge "Revise welcome screen video and still image"
2013-05-14 12:01:47 +00:00
Tadashi G. Takaoka
7348d9fb72
Revise welcome screen video and still image
...
Bug: 8159728
Change-Id: Ief8d7197879d24ccef529e975c23d6f11c7aa458
2013-05-14 20:56:09 +09:00
Ken Wakasa
d6d70e7325
Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
2013-05-14 11:46:04 +00:00
Ken Wakasa
3efa36f6aa
Revert "Fix isSuggestionsStripVisible when keyboard hidden"
...
This reverts commit cb0d1c4c58
Change-Id: Ie2c8e01c25bd051b6157e8f32ab84392a0c7252a
bug: 8954116
2013-05-14 11:44:22 +00:00
Tadashi G. Takaoka
41016acacf
Back to previous keyboard layout by canceling sliding input
...
Bug: 8915171
Change-Id: Iabdeb7920f67f89246087c3ee06240406ecfbc3d
2013-05-14 20:28:03 +09:00
Tadashi G. Takaoka
c9398a3b39
Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
2013-05-14 06:53:15 +00:00
Tadashi G. Takaoka
979fb7415b
Fix PointerTrackerQueue.releaseAllPointerOlderThan
...
Change-Id: If353869720895ee5355079c15c724132762dd70c
2013-05-14 15:32:21 +09:00
Jean Chalard
cb0d1c4c58
Fix isSuggestionsStripVisible when keyboard hidden
...
When the keyboard is hidden, the suggestion strip is
never visible.
Bug: 8954116
Change-Id: I9f242d07b49ad60b625a22429bb013251e814905
2013-05-14 15:19:19 +09:00
Kurt Partridge
6fefc142cf
Remove FeedbackLog instance variables.
...
For a while, the ResearchLogger supported comprehensive recording of the
last few words in case the user wished to upload this data to give
developers feedback. However, this mechanism was not implemented well
(keeping a separate copy of the data), did not make the collected data
clear to the user, and was not working properly in the latest build (NPEs).
The mechanism in fact was deprecated in favor of the "userRecording"
mechanism in which the user explicitly turned on comprehensive recording,
demonstrated the issue they were experiencing, and then turned it off.
This change removes the vestiges of the FeedbackLogging mechanism.
A feedback log is still used to hold the user's message, but it is created
in a local variable as-needed, and not persisted in ResearchLogger.
Change-Id: I6a09d0ed36e1eddb6e57895e7428d22107f75f49
2013-05-13 20:37:15 -07:00
Kurt Partridge
b5c39f4531
Rename a var to match semantics
...
The IS_INHIBITING_AUTO_UPLOAD flag is tested in isPossibleToUpload, so it inhibits all uploads, not
just automatic ones. Renaming to IS_INHIBITING_UPLOAD.
Change-Id: Iceed79260d4b062147f40c09f0c5bb06b2519b1b
2013-05-13 17:01:39 -07:00
Tadashi G. Takaoka
b121538e0c
Tune maximum keypress duration to 100 milliseconds
...
Bug: 8556975
Change-Id: If7839c5764f7a269243a9570c0b7782b6f7ee73b
2013-05-13 20:04:59 +09:00
Tadashi G. Takaoka
5f857a359a
Merge "Disable functional key while in sliding input mode"
2013-05-13 10:50:32 +00:00
Tadashi G. Takaoka
e3b1bdc4f1
Disable functional key while in sliding input mode
...
This change registers the functional key when sliding input mode is
end at the functional key itself.
Bug: 8915171
Change-Id: I2031e2aa4ebf33684221fc44d4a808112489724f
2013-05-13 19:39:57 +09:00
Tadashi G. Takaoka
b5f67e7faf
Add device specific keypress vibration duration database
...
Bug: 8556975
Change-Id: I11260a64dc13c102bac7a9742dc66f2b05fd32de
2013-05-13 18:34:48 +09:00
Tadashi G. Takaoka
6b0bcfba9b
Merge "Disable long press timer while sliding input mode"
2013-05-13 08:57:56 +00:00
Tadashi G. Takaoka
43ad100d8b
Disable long press timer while sliding input mode
...
Bug: 8915171
Change-Id: Id8685f90766c7de55b56476de83abf97150a186d
2013-05-13 17:40:26 +09:00
Tadashi G. Takaoka
ad662adeef
Disable delete key repeating while in slide input mode
...
Bug: 8915171
Change-Id: I04f84c29f10abc0207072d2165c75dd20f053f92
2013-05-13 17:23:08 +09:00
Tadashi G. Takaoka
18184eacb1
Support regular expression for condition pattern
...
Bug: 8556975
Change-Id: Iffc53d6a40dd77860434c5f7f4f59af5cd1ba92b
2013-05-13 16:25:03 +09:00
Tadashi G. Takaoka
ec83457d72
Merge "Support multiple condition for getDeviceOverrideValue"
2013-05-13 06:13:20 +00:00
Tadashi G. Takaoka
d69fa0a09a
Support multiple condition for getDeviceOverrideValue
...
Bug: 8556975
Change-Id: I29d3a305b6ac3d8e3620c6d8592d85047d62bf48
2013-05-13 14:38:21 +09:00
Ken Wakasa
cb3bba3c4e
Rename GesturePreviewTrail.java -> GestureTrail.java
...
Try reducing some confusions between GesturePreviewTrail.java and GestureTrailsPreview.java
Change-Id: I5fe2ee740cf1b32210530188153f6f6937e34b68
2013-05-13 13:42:22 +09:00
Kurt Partridge
7d72ca0b20
Avoid JsonWriter multi-write error
...
JsonWriter requires that its clients pass it only a single top-level object.
The existing implementation tries to make code cleaner by having mJsonWriter
never be null, and instead use a global static "NULL_JSON_WRITER" that just
discards data. But because JsonWriter complains if more than one top-level
object is passed, making this a global object does not work. This change
instead copes with mJsonWriter being null.
Change-Id: Ia37ccfc8646e91f11a64713dd92d2846eb86ac54
2013-05-10 18:21:08 -07:00
Kurt Partridge
260df84197
Merge "Remove unused code"
2013-05-10 22:12:11 +00:00
Kurt Partridge
bb17034f64
Merge "Remove ref to LatinImeLogger preference."
2013-05-10 20:41:52 +00:00
Kurt Partridge
4135c2db7b
Merge "Avoid NPE by fixing ResearchLogger initialization"
2013-05-10 15:48:04 +00:00
Tadashi G. Takaoka
565ced4546
Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
2013-05-10 09:49:07 +00:00
Tadashi G. Takaoka
6d3d2ae064
Refactor StringUtils.findPrefixedString to findValueOfKey
...
Bug: 8556975
Change-Id: I275c99db8a0d10594a5a8c0c27ebc1a87495c307
2013-05-10 18:44:04 +09:00
Tadashi G. Takaoka
4705c0fa7c
Fix screen flash when launching settings activity
...
Bug: 8336068
Change-Id: I90a0f259129a3f3319b158b060154cc43960c234
2013-05-10 15:36:24 +09:00
Tadashi G. Takaoka
2b5c9726f4
Introduce another activity to launch setup wizard
...
Bug: 8336068
Change-Id: I35b94dd87c5b01d3e927da8f918a5398dd565d33
2013-05-10 15:30:53 +09:00
Tadashi G. Takaoka
5ffa5bf3ba
Merge "Keep SetupActivity alive to check re-launching from launcher"
2013-05-10 06:24:52 +00:00
Tadashi G. Takaoka
9ed322b40f
Keep SetupActivity alive to check re-launching from launcher
...
Bug: 8336068
Change-Id: I183b8e3fd1b3898d5f8dbbb13a0c93c64341fc38
2013-05-10 15:15:53 +09:00
Jean Chalard
2564bd0937
Merge "Reuse old preferences if possible."
2013-05-10 05:56:32 +00:00
Jean Chalard
a2ec5e8338
Reuse old preferences if possible.
...
This is an optimization. It also happens to work around what
seems to be a framework bug in JB MR1 / MR1.1.
Bug: 8771179
Change-Id: I62cc7acdc8656d75f8a50c068c4e9d8c6ceb74a0
2013-05-10 14:41:36 +09:00
Tadashi G. Takaoka
2ad7023c54
Fix detecting out of keyboard area
...
Bug: 8885165
Change-Id: I85c78b23955169972fb0f5395463b6fe47f12c9c
2013-05-10 12:16:44 +09:00
Kurt Partridge
a68cace7d1
Avoid NPE by fixing ResearchLogger initialization
...
Previously, mMainResearchLog and mMainLogBuffer were set up
when the user moved to a new TextView, and set to null when
the user left the TextView. This change causes
mMainResearchLog, mMainLogBuffer, mFeedbackLog, and
mFeedbackLogBuffer to be non-null forever after init() is
called. start() no longer sets up these fields; instead
they are cleared and reset every time stop() is called.
Checks for null values are now removed.
The earlier code just didn't initialize these variables if
the user disabled logging, but since the new version
invariantly keeps these variables valid, we add a check for
whether the user has enabled logging in publishLogUnits().
Change-Id: Ifde3517f1cf924cfa33cda95fec24529b52b3c08
2013-05-09 18:38:32 -07:00
Kurt Partridge
011634163c
Remove unused code
...
Change-Id: I192c67e9e8de44f073abc70ec85ebcdb36356c2e
2013-05-09 14:36:40 -07:00
Kurt Partridge
ef5d760ca4
Remove ref to LatinImeLogger preference.
...
This is a bug; the ResearchLogger uses ResearchSettings.readResearchLoggerEnabledFlag() instead,
which the user cannot change. (We assume they will just switch to a different keyboard.)
Change-Id: Ib5731c9eeb2bc29d9cf8608033326674f5eb6f7b
2013-05-09 14:36:40 -07:00
Satoshi Kataoka
341f1b237b
Tweak gesture debug
...
Change-Id: Iea11a095adb15fbf4be38f34542119f8bc7bcbff
2013-05-09 20:08:50 +09:00
Satoshi Kataoka
52cb409ac2
Don't resize debug array if production
...
Bug: 8556775
Change-Id: I46a10f8dc938cab493933f0f2b4e1f7779b24f6f
2013-05-09 19:22:24 +09:00
Satoshi Kataoka
b2c4c73064
Add debug facilities for gesture
...
Bug: 8556775
Change-Id: I9069b2b44356bbae9fa4aaf0b99c3d723a8c9c58
2013-05-09 19:19:11 +09:00
Satoshi Kataoka
b902109000
Fix usages of getEnabledInputMethodSubtypeList
...
Bug: 8450279
Change-Id: Ib8433442ae6ca6c28da2652bff687cdeaf7c196e
2013-05-09 17:07:19 +09:00
Jean Chalard
71d52474fd
Merge "Optimizations and safeguards."
2013-05-08 10:11:49 +00:00
Satoshi Kataoka
eab27c1ef6
Merge "Add account e-mail addresses to the user dictionary"
2013-05-08 09:53:54 +00:00
Jean Chalard
9f9cc03277
Optimizations and safeguards.
...
- Don't call finishComposingText when useless.
- Add safeguards against calling setComposingRegion when the
data returned by the editor is inconsistent.
- Cancel pending recorrection messages when new messages arrive.
Bug: 8842941
Bug: 8845001
Change-Id: I939701033cf5c2bbd85871ecf83e329021ddeb91
2013-05-08 18:47:10 +09:00
Tadashi G. Takaoka
5b8b76baa3
Merge "Move gesture preview trail parameters to resource"
2013-05-08 09:02:52 +00:00
Satoshi Kataoka
5648054667
Add account e-mail addresses to the user dictionary
...
Bug: 8683365
Change-Id: Id72540c515e61c3dd854892599645dd6d22b496d
2013-05-08 17:58:21 +09:00
Tadashi G. Takaoka
05124d0193
Move gesture preview trail parameters to resource
...
Bug: 7167303
Change-Id: I22b56588dc5a1c9d5eaec3a39b5f32c9e5a8a5b4
2013-05-08 17:51:45 +09:00
Satoshi Kataoka
faa94a2d0a
Merge "Add owner's info to the dictionary"
2013-05-08 08:31:45 +00:00
Satoshi Kataoka
fc6d4a5412
Add owner's info to the dictionary
...
Bug: 8683365
Change-Id: I1c30eac128b4172526423ebeeb45bc6cee7fb67b
2013-05-08 17:29:04 +09:00
Satoshi Kataoka
6435c80087
Merge "Fix an issue on the transition between the setup and the settings"
2013-05-08 08:23:49 +00:00
Tadashi G. Takaoka
331d256f21
Fix an issue on the transition between the setup and the settings
...
Bug: 8853220
Change-Id: I99b6c46d900e9391f77986d1ae6e3edeaeff01e5
2013-05-08 15:18:45 +09:00
Satoshi Kataoka
f59c4f6840
Fix labels in the personal dictionary settings
...
Bug: 8855738
Bug: 8853764
Change-Id: I03383bb5d6d72645f511cc6175dec747eb13a840
2013-05-08 14:58:43 +09:00
Satoshi Kataoka
244a24e368
Consolidate dummy proximity info to the spell checker info
...
Bug: 8783170
Change-Id: I067486e5ec1ae7cdef8e2121392464ba71ee8add
2013-05-08 11:49:12 +09:00
Kurt Partridge
8064c669fe
Fix looping logic bugs.
...
shiftOut() is getting called once too often through these for loops.
Change-Id: I9a68b49e6cc1469bcddd673ab1567e238cf192b8
2013-05-07 08:33:31 -07:00
Tadashi G. Takaoka
104bb70c65
Merge "Avoid drawing too long gesture preview trails"
2013-05-07 11:58:09 +00:00
Jean Chalard
2afe88b8d7
Merge "Unify space-adding on gestures."
2013-05-07 11:51:01 +00:00
Tadashi G. Takaoka
80e396d83c
Avoid drawing too long gesture preview trails
...
Bug: 7167303
Change-Id: I63c2e8fb60f76e80346b67fd44399fa91930f2f0
2013-05-07 20:48:46 +09:00
Jean Chalard
e8b9b35471
Unify space-adding on gestures.
...
This is much simpler, and more correct.
Bug: 8808497
Change-Id: I7a56bf9d6d9fb481f898b7a9f5898a86c11b34c0
2013-05-07 20:38:09 +09:00
Satoshi Kataoka
a9dd74cf3f
refactor spell checker
...
Change-Id: Ie7bea23f2ac54f03572e77c31ba7cb3d5e8f8d2f
2013-05-07 20:21:11 +09:00
Tadashi G. Takaoka
9d71a6c968
Remove unused device form factor values
...
Change-Id: I1ed88b842a3d45e5460dd387bfad4276c844096a
2013-05-07 18:52:22 +09:00
Tadashi G. Takaoka
84ac8f31fb
Move empty listner to KeyboardActionListener.Adapter
...
Change-Id: Ic7bad73c089de015746c667bbfb2c09bd429a9fc
2013-05-07 16:40:15 +09:00
Tadashi G. Takaoka
61b6fc7d7b
Clean up unused static variable
...
Change-Id: I51c5903b7716d3927d2ff09a5054725215a626b5
2013-05-07 16:36:32 +09:00
Tadashi G. Takaoka
ce67b41661
Record down point as gesture preview trail for sure
...
Change-Id: Ic712a6af8229a9a1aa4a5419d779927f1ef8be67
2013-05-07 15:51:23 +09:00
Tadashi G. Takaoka
4ddf1e47a7
Remove unused gesture preview trail code
...
Change-Id: I2aa77675628a4b1655b30852c950f5daae6f0a92
2013-05-07 14:27:34 +09:00
Tadashi G. Takaoka
a5be033d4a
Preserve setup wizard step while orientation change
...
Bug: 8159728
Change-Id: I596f59749443b8878b5613285f0fe793d449cdbd
2013-05-02 18:42:10 +09:00
Tadashi G. Takaoka
7d19ab5c9d
Using int instead of booleans to save keyboard shift state
...
This is a follow up of Ib2bc262aac.
Bug: 8734294
Change-Id: I0b56797ffc4f16e18da72352777fe0f000d173aa
2013-05-02 16:21:39 +09:00
Tadashi G. Takaoka
7f8dd50b8f
Save automatic shift state while orientation changing
...
Bug: 8734294
Change-Id: Ib2bc262aacedf786a318c2fe1bd4420a21e7d847
2013-05-02 15:48:56 +09:00
Jean Chalard
83757d439e
Merge "Pass blockOffensiveWords as a parameter"
2013-05-01 11:57:36 +00:00
Jean Chalard
2dbb5957e3
Pass blockOffensiveWords as a parameter
...
Bug: 8773353
Change-Id: Ic1019742ce7ff6e4f7fff4d2729f8ab52d841488
2013-05-01 20:47:35 +09:00
Ken Wakasa
1490b53416
Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
...
Change-Id: Icb89c5119a67edaa019d5f7645b734cfcfc29041
2013-05-01 20:19:05 +09:00
Satoshi Kataoka
1641a4a457
Merge "Fix Google spell checker tests"
2013-05-01 09:31:52 +00:00
Satoshi Kataoka
d5781eef62
Fix Google spell checker tests
...
Bug: 8613307
Change-Id: Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
2013-05-01 18:21:56 +09:00
Tadashi G. Takaoka
6f7905ae75
Introduce MoreSuggestionsListener class
...
Bug: 8694255
Change-Id: I9420a7cb1983c6211f58d13b3b11db4347c3f99b
2013-05-01 18:03:37 +09:00
Tadashi G. Takaoka
47a66b12ec
Override View.drawableStateChanged to detect state_pressed
...
Unlike on JB, View.setPressed(boolean) is never called when the view
is pressed on ICS. To detect a pressed state of the view, we need to
override View.drawableStateChanged() and check the drawable state
contains state_pressed.
Bug: 8159728
Change-Id: I481051364d6f3d1370742723c3ce19d898ea5463
2013-05-01 14:02:18 +09:00
Tadashi G. Takaoka
7b2114a428
Display still image when device can't play welcome video
...
Note that the still image in this change is a placeholder and must be
replaced by final asset.
Bug: 8159728
Change-Id: I4f5a28e0af711edacbc87c2ee64508f34f67f0da
2013-05-01 12:24:36 +09:00
Jean Chalard
019c38060d
am ace3f3c5
: am 25c90e6d
: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
...
* commit 'ace3f3c5d56f5b4a58e8dc400fec1bb8c7b17a63':
Don't do recorrection when suggestions are off.
2013-04-30 19:22:13 -07:00
Jean Chalard
aa3a96f3a1
Don't do recorrection when suggestions are off.
...
Bug: 8767981
Change-Id: If5c775e488b91ae03ecce2673c99918ac8134928
2013-05-01 10:17:28 +09:00
Ken Wakasa
a0b62ece83
Merge "Cleanup an unused return value"
2013-04-30 11:16:28 +00:00
Tadashi G. Takaoka
1187ef9a97
Merge "Catch error while playing welcome video"
2013-04-30 09:31:20 +00:00
Jean Chalard
37bbaea8a1
Merge "[PB14] Cosmetic fixes to the progress bar"
2013-04-30 09:20:41 +00:00
Tadashi G. Takaoka
ad46c9e0e0
Catch error while playing welcome video
...
Bug: 8159728
Change-Id: Ic8eea7993f12395d6eca6db8d5529803251a9fee
2013-04-30 18:18:32 +09:00
Jean Chalard
7eff677c29
[PB14] Cosmetic fixes to the progress bar
...
Bug: 7600384
Change-Id: I33ea155c0c97c7ead07686c4d2a9e0d98be9929c
2013-04-30 17:54:09 +09:00