Commit graph

11596 commits

Author SHA1 Message Date
Tadashi G. Takaoka
6888ec0099 Merge "Create donottranslate debug settings string resources file" into lmp-dev 2014-09-05 08:29:35 +00:00
Tadashi G. Takaoka
6ba84dcd96 Merge "Refactor action label/icon definitions" into lmp-dev 2014-09-05 08:25:12 +00:00
Jean Chalard
17901db691 Fix a bug where CAPS_WORDS would not be returned.
Also introduce some unit tests that would have caught the bug.

Bug: 17398284
Change-Id: Idb715b7bd2f70992d6cdf4e25ef368809382caef
2014-09-05 07:56:25 +00:00
Jean Chalard
e3fc52c390 Merge "[ML4] Rename Dictionaries to DictionaryGroup" 2014-09-05 06:39:52 +00:00
Tadashi G. Takaoka
5166e9f0ff Refactor action label/icon definitions
Bug: 15782668
Change-Id: Ibf1205d46e9293d516a56030ba10841128f57450
2014-09-05 11:44:18 +09:00
Tadashi G. Takaoka
f0f49f9806 Create donottranslate debug settings string resources file
This is a follow up of the I26e4d292de.

Bug: 15678343
Bug: 17385083
Change-Id: I2c2b08b8dd991ac981aa8f8c8436de9e4399da5f
2014-09-05 11:38:29 +09:00
Tadashi G. Takaoka
626e174519 am d9458302: am 9d3db691: am 79eae0ad: Merge "Update active key backgrounds" into lmp-dev
* commit 'd9458302ea69301c521c2d77dc52cb1ae0499d19':
  Update active key backgrounds
2014-09-05 00:38:10 +00:00
Tadashi G. Takaoka
9d3db6914b am 79eae0ad: Merge "Update active key backgrounds" into lmp-dev
* commit '79eae0ada40d7af096ad95e03ab1f32c8369cb2c':
  Update active key backgrounds
2014-09-05 00:13:46 +00:00
Tadashi G. Takaoka
79eae0ada4 Merge "Update active key backgrounds" into lmp-dev 2014-09-05 00:06:23 +00:00
Baligh Uddin
5feaf11852 Merge "Import translations. DO NOT MERGE" 2014-09-04 19:21:09 +00:00
Baligh Uddin
c11f977645 Merge "Import translations. DO NOT MERGE" 2014-09-04 19:21:03 +00:00
Baligh Uddin
62181eeefe Merge "Import translations. DO NOT MERGE" 2014-09-04 19:21:00 +00:00
Baligh Uddin
059c535fbd Import translations. DO NOT MERGE
Change-Id: I054d5673b4b3fcb9303e53c8409f3ba26226e335
Auto-generated-cl: translation import
2014-09-04 05:03:06 -07:00
Baligh Uddin
c146718960 Import translations. DO NOT MERGE
Change-Id: I33d3e1e6dc9695ef779be31952ba4126d5233df2
Auto-generated-cl: translation import
2014-09-04 05:00:46 -07:00
Baligh Uddin
3305a02dc3 Import translations. DO NOT MERGE
Change-Id: I198c14a1374a0b61bf5aa3cdf013fca8260bc97f
Auto-generated-cl: translation import
2014-09-04 04:57:43 -07:00
Baligh Uddin
6146bc0bca Import translations. DO NOT MERGE
Change-Id: I7fbf4df1000e05cbd5a12a95bd60d36b5eac14d9
Auto-generated-cl: translation import
2014-09-04 04:50:29 -07:00
Jean Chalard
78d1dcd356 [ML4] Rename Dictionaries to DictionaryGroup
We're going to have multiple DictionaryGroup objects and it
would be very confusing to have this class name a plural.

Change-Id: I8f5c621459ede49f245be26097fe71f44289761c
2014-09-04 18:35:47 +09:00
Tadashi G. Takaoka
dcb49afd0c Update active key backgrounds
Bug: 15681452
Change-Id: I05f06b35748d090a58f3524df719586093431d07
2014-09-04 14:31:02 +09:00
Tadashi G. Takaoka
91b5fa5831 am 2ff7865e: am cc5050d7: Update spacebar background for Material
* commit '2ff7865e87bf8bc27e6c3f6d6067caec8828ebbf':
  Update spacebar background for Material
2014-09-03 17:55:55 +00:00
Tadashi G. Takaoka
964877a8f2 am c297197b: am 1c2cf719: Add new value "spacebar" to Key.backgroundType attribute
* commit 'c297197b1548307c31017ba3dc89bbb6bbf2223e':
  Add new value "spacebar" to Key.backgroundType attribute
2014-09-03 17:55:54 +00:00
Tadashi G. Takaoka
e355274642 am ec7d6752: am 5a9c9649: Removes "customAction" value from Key.backgroundType attribute
* commit 'ec7d67529e0dd4e5bf87e3b96c4b78db44adb96f':
  Removes "customAction" value from Key.backgroundType attribute
2014-09-03 17:55:53 +00:00
Tadashi G. Takaoka
6a4e9218ca am 2a7a5740: am 0af2472a: Add new "keyboardTheme" <case> predicator
* commit '2a7a5740e929503a0aca23f376175a9c118b7a83':
  Add new "keyboardTheme" <case> predicator
2014-09-03 17:55:52 +00:00
Yohei Yukawa
5d7b24f29c am f2c509a8: am 310da35c: Merge "Follow up API signature change" into lmp-dev
* commit 'f2c509a81ef107e6c71dc6804417469d12c94fca':
  Follow up API signature change
2014-09-03 17:41:46 +00:00
Tadashi G. Takaoka
96e4828f10 am 836987c0: am ca70bd5f: Fix depedency of debug settings
* commit '836987c0cd3d290425b37209e98295734aedb017':
  Fix depedency of debug settings
2014-09-03 17:41:45 +00:00
Yohei Yukawa
f618f351fe am 6e29bf56: am 8c42bf54: Follow API signature change in CursorAnchorInfo
* commit '6e29bf56c680331a7d1a50be38212c1356cb584d':
  Follow API signature change in CursorAnchorInfo
2014-09-03 17:41:43 +00:00
Tadashi G. Takaoka
cc5050d7ca Update spacebar background for Material
Bug: 17318036
Change-Id: Iaa091b525433d56db9aca9e0301f3727ce392605
2014-09-03 14:39:13 +00:00
Tadashi G. Takaoka
1c2cf71921 Add new value "spacebar" to Key.backgroundType attribute
Bug: 17318036
Change-Id: Ie84438a6aa3adc14a9db603d0cd4d5e37a55d612
2014-09-03 23:37:03 +09:00
Tadashi G. Takaoka
5a9c9649db Removes "customAction" value from Key.backgroundType attribute
Bug: 17318036
Change-Id: I6a36d50ba2e69eafbb0faa049014281bd4d4ddfc
2014-09-03 23:35:39 +09:00
Tadashi G. Takaoka
0af2472a69 Add new "keyboardTheme" <case> predicator
Bug: 17318036
Change-Id: Ief386c84969d8646fb5cfe2050a2f59a7db16c88
2014-09-03 23:26:46 +09:00
Yohei Yukawa
310da35c77 Merge "Follow up API signature change" into lmp-dev 2014-09-03 09:42:11 +00:00
Jatin Matani
972003428b Merge "Attempt retry for broken dictionaries" 2014-09-03 08:56:38 +00:00
Yohei Yukawa
5d6ac77732 Follow up API signature change
This is a follow up CL for API signature change in
I772c48ff18918e48a81e807b48ff907614485c09

BUG: 17320996
Change-Id: Ic8b6162bda12bf74fae79af212c5d81c400eb9e8
2014-09-03 01:13:15 -07:00
Jatin Matani
256b1b2a1e Attempt retry for broken dictionaries
1. Add retry count column within metadata in dictionary pack.
2. Attempt a retry for download and installation by running StartDownloadAction.
3. If the number retrial are at the threshold, we don't attempt it again.

Bug: 15150487
Change-Id: I70720353e5803fccf4728c2aa798883ba75c61e5
2014-09-03 17:11:06 +09:00
Tadashi G. Takaoka
ca70bd5f3a Fix depedency of debug settings
This is a follow of the I26e4d292de.

Bug: 15678343
Change-Id: I364d6df386cf32102e4ebb0151d18e49dcc5bd2c
2014-09-03 05:05:07 +00:00
Yohei Yukawa
8c42bf54af Follow API signature change in CursorAnchorInfo
This is just a follow up CL for Ia8cbb9f6b41cd9509fc0147fd68763df.
No behavial change is intended.

BUG: 17200900
Change-Id: Iba23b731ebde64ec2e816c5b4bef1d93632fce1e
2014-09-02 16:29:35 -07:00
Yohei Yukawa
961cb1abf3 am 15c29c35: am 6ef88a65: Merge "Use right arrow for the commit indicator" into lmp-dev
* commit '15c29c3538695145d34b883a1ad8222458eb6eaa':
  Use right arrow for the commit indicator
2014-09-02 19:14:25 +00:00
Yohei Yukawa
6ef88a65a2 Merge "Use right arrow for the commit indicator" into lmp-dev 2014-09-02 18:30:15 +00:00
Tadashi G. Takaoka
d27af1a5d4 am 3ad86d91: am afa9d6d8: Merge "Add theme aware key popup preview animation" into lmp-dev
* commit '3ad86d91f1e3d251635303e0fb9a83dce22efa3a':
  Add theme aware key popup preview animation
2014-09-02 17:44:10 +00:00
Tadashi G. Takaoka
012d749ef1 am 3e9bbf17: am f4383ed3: Fix missing Material light more keys\' background
* commit '3e9bbf17350d385352e62ce2326ad5898619fb88':
  Fix missing Material light more keys' background
2014-09-02 17:43:30 +00:00
Yohei Yukawa
2ea06d5e7e am 446f53f9: am ee0d8077: Show the commit indicator only for word to be auto-corrected
* commit '446f53f9c03a7846bd3d13cf61f1a7851cc8ae74':
  Show the commit indicator only for word to be auto-corrected
2014-09-02 17:34:13 +00:00
Tadashi G. Takaoka
afa9d6d8de Merge "Add theme aware key popup preview animation" into lmp-dev 2014-09-02 12:17:57 +00:00
Tadashi G. Takaoka
ac88f3d845 Add theme aware key popup preview animation
Bug: 15678343
Change-Id: I26e4d292deab37724387cc9ebc03033fcd698c60
2014-09-02 18:45:23 +09:00
Jean Chalard
a341e7d244 Merge "[ML3] Put the locale in SuggestedWordInfo" 2014-09-02 06:40:59 +00:00
Jean Chalard
c0d3123930 Merge "[ML2] Small refactoring" 2014-09-02 06:40:51 +00:00
Tadashi G. Takaoka
f4383ed3a2 Fix missing Material light more keys' background
Bug: 15782668
Change-Id: I8b59d8a4dabe03418e520c18d5d64e2d10f4cae2
2014-09-02 10:59:23 +09:00
Baligh Uddin
509b6c9ad6 Merge "Import translations. DO NOT MERGE" 2014-09-01 21:45:59 +00:00
Baligh Uddin
7cf3d513f1 Merge "Import translations. DO NOT MERGE" 2014-09-01 21:45:42 +00:00
Baligh Uddin
c5e9f51d3d Import translations. DO NOT MERGE
Change-Id: I7f8ff7d676862ccba5c3f4bf4675d8252e6669db
Auto-generated-cl: translation import
2014-09-01 04:12:00 -07:00
Baligh Uddin
8b0db442fa Import translations. DO NOT MERGE
Change-Id: Ic84804506b360a3d1d756f907be7f3dcedf26a23
Auto-generated-cl: translation import
2014-09-01 04:10:46 -07:00
Jean Chalard
576c96af95 [ML3] Put the locale in SuggestedWordInfo
...and remove it from SuggestionResults.

Change-Id: Iae85ec7e82e2caf18cc6d7656aa46dc150707cdd
2014-09-01 20:09:32 +09:00
Jean Chalard
146cb98e54 [ML2] Small refactoring
Change-Id: I1283d666b8904ff4e6c012332bdbc9c0c13df415
2014-09-01 20:09:24 +09:00
Jatin Matani
962c40d326 Merge "StatsUtilsManager should be initiated(#onCreate) before loadSettings." 2014-09-01 08:27:19 +00:00
David Faden
95b7bd3ba5 Add a private IME option to suppress the gesture floating preview text.
If the option defined by Constants.NO_FLOATING_GESTURE_PREVIEW is set
for a text field via EditorInfo.privateImeOptions, the floating gesture
preview will be suppressed regardless of the settings preference.

Feature request:
bug: 17325039

Change-Id: I1a1df194369e8f2d76abd9d84939a057f55f4a1c
2014-09-01 03:59:38 +00:00
Keisuke Kuroyanagi
dec2c2d910 Merge "Support multiple locales in distractor filter." 2014-09-01 03:27:35 +00:00
Yohei Yukawa
2412d9ae3c Use right arrow for the commit indicator
Change-Id: I5074acd2eec451f77b47378bf9a5f7a14c792ce6
2014-08-29 22:29:25 -07:00
Yohei Yukawa
ee0d8077d6 Show the commit indicator only for word to be auto-corrected
Change-Id: I61e25b960ae083857efc2704498a0761e0965ad3
2014-08-29 17:31:36 -07:00
Jatin Matani
aa223400c3 StatsUtilsManager should be initiated(#onCreate) before loadSettings.
Change-Id: I9002b4afb023e55ab251ea070ec0b7a6ace99261
2014-08-29 15:51:57 -07:00
Tadashi G. Takaoka
f5960b4f62 am 034a4a5a: am c4710124: Merge "Fix the order of keys on more keys keyboard" into lmp-dev
* commit '034a4a5a19ba37dba8999b3763ae756fe748deaf':
  Fix the order of keys on more keys keyboard
2014-08-29 19:07:06 +00:00
Tadashi G. Takaoka
2d713c87c6 am 2fabd50d: am f507d1fe: Support RTL layout in custom input style settings
* commit '2fabd50df49f894afde15ac5f4ebd2ff5372a9c4':
  Support RTL layout in custom input style settings
2014-08-29 19:07:04 +00:00
Jean Chalard
78bb2dd945 am 3bd8eee3: am 4e28a6a8: Fix an IOOB exception
* commit '3bd8eee3e8c3e89539578a4231661819de65c804':
  Fix an IOOB exception
2014-08-29 19:07:03 +00:00
Tadashi G. Takaoka
f9af39e53e am 727cd740: am f2eadbb4: Clear keyboard cache when system locale is changed
* commit '727cd74072d97af334fe8c0d18fa6a1e23629ccb':
  Clear keyboard cache when system locale is changed
2014-08-29 19:07:02 +00:00
Keisuke Kuroyanagi
fdaedb6c1d Support multiple locales in distractor filter.
Bug: 16547557
Change-Id: I4aba278eb4114e0075f3f8b38c7e132743927fa8
2014-08-29 22:29:30 +09:00
Keisuke Kuroyanagi
9eec97d5b0 Merge "Use DictionaryFacilitatorLruCache for personalization." 2014-08-29 10:10:40 +00:00
Tadashi G. Takaoka
c471012483 Merge "Fix the order of keys on more keys keyboard" into lmp-dev 2014-08-29 09:58:28 +00:00
Tadashi G. Takaoka
f507d1febb Support RTL layout in custom input style settings
Bug: 17322353
Change-Id: I3b211ab8729121271563a8a243558a58ee7847c2
2014-08-29 18:28:53 +09:00
Jean Chalard
4e28a6a844 Fix an IOOB exception
Bug: 17316001
Change-Id: Iaa2cfd30ebbe0d49e10a5c3a30336e06817d0a8b
2014-08-29 06:56:34 +00:00
Keisuke Kuroyanagi
e59f3e4fbf Use DictionaryFacilitatorLruCache for personalization.
Bug: 16547557

Change-Id: I5faba5e26d072b49c0fffcaeaf5062f9e0c2dcc0
2014-08-29 12:57:50 +09:00
Tadashi G. Takaoka
a9fc8622fe Fix the order of keys on more keys keyboard
This CL fixes the behavior of !autoColumnOrder!<n> flag in a more keys
specification. Formerly the <n> value specifies the maximum number of
column of more keys. With this CL, the <n> value specifies the exact
number of column of more keys.

Bug: 16603887
Change-Id: I2120620fa512ee30043bb146ad675a942a375129
2014-08-29 11:06:20 +09:00
Jatin Matani
aabb351279 Refactor StatsUtils into two components:StatsUtils & StatsUtilsManager
Bug:16522256
Change-Id: I9cb8129c552159cf17ea5c2656e0988bf0f999f5
2014-08-28 17:28:23 -07:00
Tadashi G. Takaoka
f2eadbb497 Clear keyboard cache when system locale is changed
Bug: 17310080
Change-Id: I2b388772f269f1e7610a5bd32de80793da2df16e
2014-08-28 22:50:07 +09:00
Jean Chalard
98e56c6905 am 3ef26ac1: am 6bd267f4: Merge "Add new attributes to our notification" into lmp-dev
* commit '3ef26ac13b677bc8d7adeed378ce6d6cbad171ee':
  Add new attributes to our notification
2014-08-28 09:52:03 +00:00
Jean Chalard
a2928484f6 Add new attributes to our notification
Bug: 17167221
Bug: 17128331
Change-Id: I6a045fd2398f40dbdc10c9d20993f7513e1f2cff
2014-08-28 07:47:07 +00:00
Jean Chalard
f95770354c Straighten the dead char implementation, take 3.
Change-Id: I4f70f6eebe076c7d2b780d25e3a2c1d3faa2edfa
2014-08-28 16:03:45 +09:00
Keisuke Kuroyanagi
b85349e981 Merge "Create DictionaryFacilitatorLruCache." 2014-08-28 03:09:28 +00:00
Yohei Yukawa
af5c2b24e7 am 8d0d2363: am acce1aa5: Make sure to obtain the IC before requesting CursorAnchorInfo
* commit '8d0d236394548be4e2302a03960ce4ee363a5483':
  Make sure to obtain the IC before requesting CursorAnchorInfo
2014-08-27 23:41:33 +00:00
Yohei Yukawa
acce1aa59e Make sure to obtain the IC before requesting CursorAnchorInfo
RichInputConnection#requestUpdateCursorAnchorInfo must make
sure to obtain the input connection before calling methods
of it.

BUG: 17299587
Change-Id: I8e0cd473a4cc32583cd47634c227d702f7c69c6c
2014-08-27 15:59:52 -07:00
Baligh Uddin
cb7d1a63f1 Merge "Import translations. DO NOT MERGE" 2014-08-27 18:33:41 +00:00
Baligh Uddin
723d24e5a8 Merge "Import translations. DO NOT MERGE" 2014-08-27 18:33:41 +00:00
Baligh Uddin
4b97e997f5 Merge "Import translations. DO NOT MERGE" 2014-08-27 18:33:38 +00:00
Baligh Uddin
6f67018d8d Merge "Import translations. DO NOT MERGE" 2014-08-27 18:33:34 +00:00
Ken Wakasa
95c4d26994 Merge "Revert "Straighten the dead char implementation."" 2014-08-27 15:07:52 +00:00
Ken Wakasa
0ba6bcb16d Revert "Straighten the dead char implementation."
This reverts commit 5ef447aeea.

Reverting because this broke a bunch of unit tests -- https://sponge.corp.google.com/target?id=b6439742-099e-46cb-8f00-d0c602a4d9bb&target=com.google.android.inputmethod.latin.tests&searchFor=&show=FAILED&sortBy=STATUS

Change-Id: Ibbd9e11372993f62e630fd9da37158ffcf47c17a
2014-08-27 15:07:28 +00:00
Keisuke Kuroyanagi
d267764d5a Create DictionaryFacilitatorLruCache.
This class is separated from AndroidSpellCheckerService

Bug: 16547557

Change-Id: I3e58521207395588cecb2977234b89067d6da8c3
2014-08-27 22:00:48 +09:00
Jean Chalard
4204d59864 Merge "Straighten the dead char implementation." 2014-08-27 12:54:49 +00:00
Tadashi G. Takaoka
8b5788d72b am 68a2a69a: am 37beaf15: Simplify onComputeInsets of LatinIME
* commit '68a2a69ae35352650a4c6dfc0b0c69069c4a1e1d':
  Simplify onComputeInsets of LatinIME
2014-08-27 10:44:51 +00:00
Tadashi G. Takaoka
37beaf1529 Simplify onComputeInsets of LatinIME
This CL expands SoftInputWindow to the entire screen. Thus a key
review backing view is eliminated and onComputeInsets() gets
simplified too.

Bug: 17212702
Bug: 10841052
Bug: 10541453
Change-Id: I2d859f4e4698c64cabe399000821f13bab729996
2014-08-27 19:20:38 +09:00
Yohei Yukawa
00042cb453 am c925ca43: am 97681ebd: Set highlight color along with the commit indicator
* commit 'c925ca43a6e0b3175feb002ce6b5577ef7d66507':
  Set highlight color along with the commit indicator
2014-08-27 10:01:24 +00:00
Ken Wakasa
6da1c674fd resolved conflicts for merge of 8159336b to master
Change-Id: I9dd726593c6768b1db35305935ee69b0937358ef
2014-08-27 18:55:39 +09:00
Ken Wakasa
c1596086d3 resolved conflicts for merge of 0268f736 to master
Change-Id: Ib89ef55a8752f9b5e357eed3a05c79dd28d0ec0e
2014-08-27 18:41:31 +09:00
Baligh Uddin
511e6729db Import translations. DO NOT MERGE
Change-Id: I0e264ee268375e1de7cd887a15f5b5e58e088329
Auto-generated-cl: translation import
2014-08-27 02:18:44 -07:00
Baligh Uddin
d002c54ec2 Import translations. DO NOT MERGE
Change-Id: I632754d86444b86051d9d27becef3994c82a9458
Auto-generated-cl: translation import
2014-08-27 02:13:38 -07:00
Baligh Uddin
d036341454 Import translations. DO NOT MERGE
Change-Id: Icd839563ab1ac8d8233a8c8ad49daee02a87bd2b
Auto-generated-cl: translation import
2014-08-27 02:12:14 -07:00
Baligh Uddin
bd187bd803 Import translations. DO NOT MERGE
Change-Id: I067525751c072822661b855072b25e574f719a23
Auto-generated-cl: translation import
2014-08-27 02:10:48 -07:00
Jean Chalard
5ef447aeea Straighten the dead char implementation.
This now supports all cases, including cases not supported by
the framework.
Now rebased on top of the right change, and renamed

Change-Id: I7886f0dcbb86cdb4dccec09aa7c52ad339680e04
2014-08-27 17:59:39 +09:00
Yohei Yukawa
97681ebdf1 Set highlight color along with the commit indicator
With this CL, the text highlight color is applied
when the commit indicator is displayed.

Note that the underline is not rendered when the
background color is enabled. This is a known issue.

Change-Id: Ia19355e1303e3a10e8a7d69bc47c779feb70248a
2014-08-27 01:41:16 -07:00
Yohei Yukawa
29200b0abe Set the text bgcolor only when CursorAnchorInfo is available
When CursorAnchorInfo is unavailable, we shouldn't try to show
the commit indicator and set the text highlight color.

With this CL, RichInputConnection can be used to track if the
application responded that it does support CursorAnchorInfo or
not.  This result will be taken into consideration when
InputLogic needs to determine whether the commit indicator
should be displayed or not.

Change-Id: I945d70eeb02a7a5f3d9b22459b23d7028508910f
2014-08-27 01:30:45 -07:00
Yohei Yukawa
a475c85480 Introduce a mechanism to hide the indicator speculatively
This is an optional optimization to reduce the UI latency.

Imagine that the commit indicator is now displayed and the
composing text is being updated, it is highly likely that
the commit indicator will disappear unless the application
rejects the setComposingText request.

If we assume that the application will accept the new
composing text without any modifications, we can hide the
indicator without waiting for the arrival of new
CursorAnchorInfo event.

This optimization isn't dangerous because we can show the
indicator again when we receive new CursorAnchorInfo event
and the assumption is turned out to be invalid.

Change-Id: Id59c6607a1029782410611e768791af9984f14ac
2014-08-26 23:42:53 -07:00
Yohei Yukawa
bea17c49ec Introduce commit/add-to-dictionary indicators
This CL introduces commit/add-to-dictionary indicators.

Note that the text is not yet highlighted when the commit
indicator is displayed. It will be addressed in subsequent
CLs.

Change-Id: I7e9b0fcfdc0776a50a1d8cfb41ee0add813317dd
2014-08-26 21:20:27 -07:00
Ken Wakasa
4660ecaa44 Merge "Fix a bug where mic/emoji key wouldn't work." 2014-08-26 13:30:15 +00:00
Jean Chalard
e38043849e Fix a bug where mic/emoji key wouldn't work.
Bug: 17272902
Bug: 17269948
Change-Id: I561609fa84a6265f8148db7d2411bc1fd38dd163
2014-08-26 22:06:21 +09:00