Commit graph

877 commits

Author SHA1 Message Date
Yohei Yukawa
f6997344e6 Experimentally specify languageTag attribute.
With previous CLs [1][2], now we can associate a BCP 47 language tag for
each InputMethodSubtype in XML resource file by "languageTag" attribute.
In order to test that the functionality, we start using "languageTag"
for some subtypes.

Note that specifying "languageTag" for all the existing subtypes is
beyond the goal of this CL, which should be handled in subsequent CLs.

Here is the list of subtypes that start having "languageTag" attribute.
  - android:imeSubtypeLocale="en_US" -> android:languageTag="en-US"
  - android:imeSubtypeLocale="en_GB" -> android:languageTag="en-GB"
  - android:imeSubtypeLocale="fr   " -> android:languageTag="fr"
  - android:imeSubtypeLocale="fr_CA" -> android:languageTag="fr-CA"
  - android:imeSubtypeLocale="fr_CH" -> android:languageTag="fr-CH"
  - android:imeSubtypeLocale="tl"    -> android:languageTag="fil"

  [1]: I77db5b99a7cf745d800db75baf135bb60ad04820
       8d6eeb01df72891acd3aa75e64aa1595a41cc96e
  [2]: I251d3d999afd13c0d618f2cb59e8ed3d47f21c98
       b8456a6a483ce62c81b92f613561fb761be0f3e8

Bug: 22858221
Change-Id: I37cb9ce196f2e23589e60ce34475504405778bbb
2016-01-21 23:47:11 -08:00
Chieu Nguyen
7674a65367 Unicode 8.0 emoji additions to Google Keyboard.
Squashed commit of the following:

    commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Tue Nov 10 11:29:44 2015 -0800

        Remove check for version code.
        This was unnecessary and caused multi-codepoint
        emoji to not show up on any device.

        Bug: 25369504
        Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed

    commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 18:12:58 2015 -0800

        Fix Material icons for new tab.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2

    commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 17:16:10 2015 -0800

        Remove extraneous TalkBack descriptions.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096

    commit 07357bdec69b5fc118c82401d59b61ad7b802c22
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 16:01:34 2015 -0800

    	Better checking of whether to display new emoji.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f

    commit 666a92f17034f5a1948e70f40226ed995c72d81f
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 12:54:53 2015 -0800

        Fix shading on emoji category icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56

    commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 19:06:57 2015 -0800

        Add new emoji categories to Holo Blue.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca

    commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 18:06:35 2015 -0800

        Fix default category, remove xxxhdpi Holo icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6

    commit 15c0b578343db2baa873096891a69305398eb830
    Merge: 77bc6fc 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:08 2015 +0000

        Merge changes  into jb-ub-latinimegoogle

    commit 77bc6fcfd760232757b5751993c0046f2a43626a
    Merge: b0380a0 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:04 2015 +0000

        Merge "Remove Kosovo from flags (no glyph)." into
        jb-ub-latinimegoogle

    commit b0380a0744647039278ad6648b7a1bc94eeab623
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:42:24 2015 -0800

        Add icons for new emoji categories.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I1182e031994332b2e618406ad1cd467cb050766e

    commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:29:33 2015 -0800

        Remove Kosovo from flags (no glyph).

        Bug: 25369504
        Bug: 16185905
        Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5

    commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 14:30:58 2015 -0800

        Update emoji set to blacklist non-color glyphs.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463

    commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Wed Nov 4 17:18:22 2015 -0800

        Add Unicode 8.0 emoji to emoji palette.

        Currently all emoji category tabs use the flower
        icon. A future CL will update these once the
        icons are finalized.

        If glyphs do not exist for new emoji, the old
        categories will be shown.

        Bug: 25369504
        Bug: 16185905

        Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121

    commit 4a4a042072790b19048a14d2ddab655b1be31a6e
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Sun Nov 1 18:38:20 2015 -0800

        Add description strings for Unicode 8.0 new emoji.

        Bug: 16185905
        Bug: 25369504

        Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17

Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
2015-11-11 11:04:45 -08:00
Ian Pedowitz
e1d5012683 Revert "Unicode 8.0 emoji changes to Google Keyboard."
This reverts commit 9cc42549d1.

Change-Id: Ia3b037160e55bc54ef55194b967d9c91f6814ff8
2015-11-10 03:29:41 +00:00
Chieu Nguyen
9cc42549d1 Unicode 8.0 emoji changes to Google Keyboard.
Squashed commit of the following:

    commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 18:12:58 2015 -0800

        Fix Material icons for new tab.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2

    commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 17:16:10 2015 -0800

        Remove extraneous TalkBack descriptions.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096

    commit 07357bdec69b5fc118c82401d59b61ad7b802c22
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 16:01:34 2015 -0800

    	Better checking of whether to display new emoji.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f

    commit 666a92f17034f5a1948e70f40226ed995c72d81f
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 12:54:53 2015 -0800

        Fix shading on emoji category icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56

    commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 19:06:57 2015 -0800

        Add new emoji categories to Holo Blue.

        Bug: 25369504
        Bug: 16185905
        Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca

    commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 18:06:35 2015 -0800

        Fix default category, remove xxxhdpi Holo icons.

        Bug: 25369504
        Bug: 16185905

        Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6

    commit 15c0b578343db2baa873096891a69305398eb830
    Merge: 77bc6fc 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:08 2015 +0000

        Merge changes  into jb-ub-latinimegoogle

    commit 77bc6fcfd760232757b5751993c0046f2a43626a
    Merge: b0380a0 8604ce3
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Fri Nov 6 00:59:04 2015 +0000

        Merge "Remove Kosovo from flags (no glyph)." into
        jb-ub-latinimegoogle

    commit b0380a0744647039278ad6648b7a1bc94eeab623
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:42:24 2015 -0800

        Add icons for new emoji categories.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I1182e031994332b2e618406ad1cd467cb050766e

    commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 16:29:33 2015 -0800

        Remove Kosovo from flags (no glyph).

        Bug: 25369504
        Bug: 16185905
        Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5

    commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Thu Nov 5 14:30:58 2015 -0800

        Update emoji set to blacklist non-color glyphs.

        Bug: 25369504
        Bug: 16185905
        Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463

    commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
    Author: Chieu Nguyen <cvnguyen@google.com>
    Date:   Wed Nov 4 17:18:22 2015 -0800

        Add Unicode 8.0 emoji to emoji palette.

        Currently all emoji category tabs use the flower
        icon. A future CL will update these once the
        icons are finalized.

        If glyphs do not exist for new emoji, the old
        categories will be shown.

        Bug: 25369504
        Bug: 16185905

        Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121

Change-Id: Ia5a5879cea828ea4cb4c678765fe5d9e5ecbfcd2
2015-11-06 18:22:05 -08:00
Dan Zivkovic
764a18cd92 Revert "Remove "Personal dictionary" link from settings."
This reverts commit 76de0a8f52.

Bug 21881199.

Change-Id: I53f42a1e8f25d214de97264f4d25813bc637cafa
2015-06-16 18:26:02 -07:00
Chieu Nguyen
a2376cd2b4 Restore switch for showing app icon.
Bug: 20307420
Change-Id: I95969de40936d2ea992669324d0c4df7e8de2bd9
2015-04-22 15:46:40 -07:00
Dan Zivkovic
76de0a8f52 Remove "Personal dictionary" link from settings.
Bug 19966848.

Change-Id: Ice6a030d2d2319822d5108c5b6a37efa4de1090f
2015-03-30 17:27:56 -07:00
Jatin Matani
66f139889d Don't hide sync settings, v2 (cleaner)
Bug:19961809
Change-Id: I02d6bd773dc20112c8fa3b83ac305d0cdbbd58d0
2015-03-27 16:32:12 -07:00
Chieu Nguyen
67bb8cbe61 Disable Hinglish locale.
Bug: 19899126.
Change-Id: I1824233b3bcb6cb6579714a7eb375ea2cebc39db
2015-03-23 18:05:04 -07:00
Dan Zivkovic
5cf457c976 Remove external dictionary debug UI.
We don't support this feature in Delight3.

Change-Id: Iebef4191c28cf6d169d351039174cd841d448799
2015-03-20 10:23:05 -07:00
Chieu Nguyen
d4ce5e944b Disable si_LK and ta_LK subtypes.
Bug: 19815109
Change-Id: I3681fcf17752defdf3c1bacff9dadb60df2468ab
2015-03-18 10:24:07 -07:00
Dan Zivkovic
5455179b54 Revert "Next-word suggestion bit in keyboard settings."
This reverts commit 1ae16dc3db.

Bug 19596067.

Change-Id: Ie7286acbb70b215d7bd08e271bcf14526b68576f
2015-03-16 11:23:22 -07:00
Chieu Nguyen
116e58c437 Remove autocorrection aggressiveness settings.
Replace multiple settings with binary switch for autocorrection.

Bug: 19589766
Change-Id: Ic8a0362dd36d18930493a55699851161e9cb23e8
2015-03-13 12:21:26 -07:00
Chieu Nguyen
e787b3b761 Remove setting switch for phrase gesture.
Bug: 19687841
Change-Id: I74ed9acfd5330d7461233d4146395aefb9d2d9c4
2015-03-11 12:06:22 -07:00
Dan Zivkovic
1ae16dc3db Next-word suggestion bit in keyboard settings.
This feature works in supported languages.
We don't need a user setting.

Bug 19596067.

Change-Id: Icdded772745f9816da47f8a5e3b87b733083b121
2015-03-04 15:02:53 -08:00
Jatin Matani
854edce6dd Turn off cloud sync if we have managed profiles
UserManager#getUserProfiles > 1 implies managed
profile.

Workflow:
- Disable sync prefs
- Execute an async task to check for managed profile; if
  managed profile is found, remove the sync prefs. If not, enable
  the preference;
- Move the logging pref from Advanced to Account & Privacy.

Bug:19230544
Change-Id: I4dbd1fe8433b3263ccc74c35dc0ee0bb371122b3
2015-03-02 12:03:57 -08:00
Jatin Matani
8ec328fb2e Refresh pref settings for cloud sync
- Show the opt-in text
- Show the account picker if user presses 'enable sync'. Previously
  we disabled the sync pref which was confusing.
- Remove the debug tags from some prefs; and improve messaging overall

General rules;
- sync is turned ON : user checks 'enable sync' pref AND
  accepts the opt-in AND chooses an account
- sync is turned OFF: when user signs out

Demo link
https://drive.google.com/a/google.com/file/d/0B9tNQOWdRuiWSUdVVE5rVDJudlk/view?usp=sharing

Change-Id: I2e7933796b15e47005ba9970a8c1294416ef31a0
2015-02-26 11:43:42 -08:00
Dan Zivkovic
77e0fa1d67 LatinIME portion of multi-lang option removal.
Bug 19188067.

Change-Id: Ic9a3637f59dda30c699141222b9dcac3cd624b99
2015-01-29 15:57:03 -08:00
Dan Zivkovic
e1758feeff Disable the Burmese keyboard.
We'll resurrect this effort in the new code base.

Bug 16900511.

Change-Id: Iae4cd27cb29cb8f991e97cffd88ed59c30d66628
2015-01-29 10:17:33 -08:00
Dan Zivkovic
bd254ca776 Merge "Re-enable new keyboard layouts in Fava." 2015-01-21 19:34:12 +00:00
Dan Zivkovic
9ea443e8c0 Re-enable new keyboard layouts in Fava.
This reverts commit da27faeb87.

Change-Id: I08e2b2510efcafd20743679de4a1ef7f09d9949a
2015-01-20 19:37:26 +00:00
Dan Zivkovic
d913617e0c AOSP change for showing the app icon.
This change deletes a bunch of code that was used to conditionally show/hide
the keyboard app icon given system states and user preferences.

Bug 19001197.

Change-Id: I69a57aa21872a571af87a193b3e52b7f985e5168
2015-01-16 09:37:30 -08:00
Dan Zivkovic
da27faeb87 Revert "Enable preliminary subtypes for F-release"
Bug 17743363: Preliminary subtypes should be removed from F-release

This reverts commit 45c917e238.

Change-Id: I5e91a7fd0efdc16e140a91fab6300bd8ba9cd6c7
2015-01-12 16:35:54 -08:00
Jatin Matani
25daca0053 Merge "Provide a preference to delete data from cloud." 2014-12-12 19:43:16 +00:00
Jatin Matani
6814e7aa87 Provide a preference to delete data from cloud.
For now, it is a debug preference, but we may make this a proper
user setting in the future. Thus note that the messaging is not
final.

Pref looks like :
1. https://screenshot.googleplex.com/OLxW0myWD9.png
2. https://screenshot.googleplex.com/YeqWYXGstw.png

Bug: 18106936
Change-Id: I88bbc1a2ee0c23a48ff3972a91d57c218b10bb65
2014-12-09 12:45:34 -08:00
Tadashi G. Takaoka
be819dbe2b Revert "Add keyboard margin options to place the keyboard dynamically."
This reverts commit 8584db1461.

Bug: 18675223
Bug: 18675476
Change-Id: I4e25d87ac261c44b1943df832115f8cca690103a
2014-12-09 17:53:24 +09:00
Andy Wang
8584db1461 Add keyboard margin options to place the keyboard dynamically.
Keyboard location and location can now be set in the debug options
section.

Change-Id: I87c5a1d679489e12dccf26632c399af28087629e
2014-12-05 16:21:20 +09:00
Tadashi G. Takaoka
64885b263e Fix settings keys on tablet
Bug: 18531491
Change-Id: Id374932b71674177abddd6d249ba6e712cbb5d25
2014-11-27 16:08:53 +09:00
Tadashi G. Takaoka
5c6766a58d Remove preliminary mark from Bengali Akkhor keyboard
Bug: 16143057
Change-Id: I4f048a15b8b810f47622c8ec87773ff7470d20f2
2014-11-18 18:42:39 +09:00
Tadashi G. Takaoka
6030d4f0f4 Fix emoji key background of Holo themes
Bug: 18361310
Change-Id: Ie56f2af8fc43499d1fa1d505fb4941cd5dba1395
2014-11-13 16:32:18 -08:00
Tadashi G. Takaoka
3481cfc81d Fix Emoji key feedback
Bug: 18166905
Change-Id: I629eab41b78810325710ce024068b86a157186b4
2014-11-04 20:26:43 +09:00
Tadashi G. Takaoka
ede88a3bd6 Merge "Revert "Fix Emoji key feedback"" 2014-11-04 11:25:58 +00:00
Tadashi G. Takaoka
a5d24336bf Revert "Fix Emoji key feedback"
This reverts commit 953858d615.
The original CL should be split into two.

Change-Id: Ic1d032e2964a1b9bb44d98bdb8573c6cb47a865c
2014-11-04 11:24:26 +00:00
Tadashi G. Takaoka
11cdcf604c Fix missing ZWNJ key of BengaliAkhhor keyboard
This CL also fixes the wrong script of Bengali Akkhor.

Change-Id: Id4af2ea160b4ef3cfd40ffc5984354bc60f0b7b7
2014-11-04 18:53:28 +09:00
Tadashi G. Takaoka
c514d3ead2 Merge "Fix Emoji key feedback" 2014-11-04 09:17:51 +00:00
Tadashi G. Takaoka
953858d615 Fix Emoji key feedback
Bug: 18166905
Change-Id: I3c3296cabeed31e1250ff0753ea94576b494b96a
2014-11-04 17:49:18 +09:00
Tadashi G. Takaoka
981d465d78 Fix symbol letter size of phone/number layout
This CL
- decreases the size of symbols letter on number and phone layout.
- increases the size of "Pause" and "Wait" label.
- fixes "Pause" and "Wait" label for no language keyboard

Bug: 18179572
Change-Id: I6e8b4a8e07d805c3da0558b4832291ce41ad3db0
2014-11-04 16:48:04 +09:00
Tadashi G. Takaoka
d071545df9 Fix number and phone keyboard visual glitches
Bug: 18179572
Change-Id: I387b965ed4f7adc5a34b63e622520e3c88ffd5ca
2014-11-04 13:35:24 +09:00
Andy Wang
bb9400aebc Add a preference to resize the keyboard height.
The keyboard height is controlled by a slider in the debug preferences.
Without access to debug preferences, this change is a no-op.

Bug: 6867494
Change-Id: I984064ed1cab752876615f5ed582818474d6041b
2014-10-30 11:45:41 +09:00
Tadashi G. Takaoka
f7e01e866f Remove device checking of Emoji physical key
This CL also adds a settings option to enable/disable an Emoji-ALT
physical key.

Bug: 18122464
Change-Id: Iee1d97efec979a902b0492071d5e511ca1792ff0
2014-10-27 16:26:22 +09:00
Tadashi G. Takaoka
45c917e238 Enable preliminary subtypes for F-release
Bug: 17743363
Change-Id: I098ae6e21a7f2a1ceed1d206740a2d12e1ef7d99
2014-10-22 18:52:53 +09:00
Tadashi G. Takaoka
f9a4b20c96 Merge "Fix missing Telugu letters" 2014-10-17 16:59:49 +00:00
Tadashi G. Takaoka
a97bae4e8b Fix missing Telugu letters
This CL adds missing the following Telugu letters
- U+0C4A: TELUGU VOWEL SIGN O
- U+0C1E: TELUGU LETTER NYA
And also reorganizes some letter reasonably.

Bug: 10028759
Change-Id: If7fd3854ffab8484dbe6ced0ff2ed52be838e44d
2014-10-17 19:21:59 +09:00
Tadashi G. Takaoka
ad2f695083 Bring back long press timeout settings
Bug: 18025209
Change-Id: Id8dbb051e04270f6892cae12a443103bd0d32dcb
2014-10-17 18:20:43 +09:00
Sandeep Siddhartha
d9015233f5 Set up a sync preference and policy for syncing [2]
- Adds a preference for enabling sync, which controls the sync behavior
- Make the ProductionFlags depend on appropriate flags to guarantee that
  we don't mess things when flipping some flags
- Preferences now control the "syncable" property of the provider
  thereby controlling the policy and when this entry shows up in
  system settings.

Bug: 17464069
Change-Id: I1d58351188518c1ae9f1f9e147b5ea15d32a3427
2014-10-10 16:03:54 -07:00
Jatin Matani
847735fdfa Merge "Skeleton code for user dictionary sync" 2014-10-08 02:09:50 +00:00
Jatin Matani
734733d8ad Skeleton code for user dictionary sync
Bug:17464069
Change-Id: If683b80e882c07fba576959346ae74cd445dd83e
2014-10-07 12:30:12 -07:00
Tadashi G. Takaoka
f849d21a5d Fix currency symbol size
Bug: 17877107
Change-Id: I0723fc86792ec5a20ac54a1d3c965293ba1f0bd2
2014-10-07 00:51:47 +09:00
Tadashi G. Takaoka
6fb586a527 Fix missing prediction words on contextual strip
Bug: 17874801
Change-Id: Iaba935a6b2548376f10a0ecd80f07ea7ada6c60a
2014-10-07 00:06:53 +09:00
Tadashi G. Takaoka
162ca68051 Remove preliminary subtypes from E-MR1 release
Note that unit test for Sinhala (Sri Lanka) and Tamil (Sri Lanka) have
been unexpectedly @suppressed.

Bug: 17743363
Change-Id: I4076a61adbf2d4aee58417d0c354b8ef4a938668
2014-10-06 23:42:14 +09:00