Commit Graph

1351 Commits (62293799037f0c4b6b50e2511168cecc1d89f397)

Author SHA1 Message Date
Keisuke Kuroyanagi f4928ad4dd Merge "Update useless n-gram entry detection logic during GC." 2014-10-15 21:44:45 +00:00
Keisuke Kuroyanagi 3601c214f8 Update useless n-gram entry detection logic during GC.
Bug: 14425059
Change-Id: Ib939deae5b60167751dee07965bb1ef1a43c4625
2014-10-15 20:43:27 +09:00
Jean Chalard 9ddbee8570 Add the first gesture unit tests.
At last I found a simple way to do it !

Bug: 8845843
Change-Id: I4dd3bf987b58e29a44cf0d7389d294657a33abe1
2014-10-15 19:04:06 +09:00
Sandeep Siddhartha 56ad6f35b3 Merge "Add label and icon to the test app" 2014-10-15 00:35:27 +00:00
Sandeep Siddhartha b17a3bc4e8 Move sync policy related code out of account settings
Bug: 17981687
Bug: 17464069
Change-Id: I0ae3400564fd346cc84af74dfef65f01cc1ce6a8
2014-10-14 13:39:28 -07:00
Sandeep Siddhartha 29f0b0f578 Add label and icon to the test app
This helps us easilty distinguish between the different test targets visually.

Bug: 17946996
Change-Id: I822a29cfb9b5bc5df3d93a884ffdf7d050737e04
2014-10-14 10:17:35 -07:00
Keisuke Kuroyanagi d1471ee053 Merge "Remove shouldBlockAutoCorrectionBySafetyNet" 2014-10-14 10:52:32 +00:00
Keisuke Kuroyanagi 29b4f7aa67 Remove shouldBlockAutoCorrectionBySafetyNet
Bug: 13756409

[Category diff]
+1      27
-1       0
+2       0
-2       0
+3       0
-3       1
+4      11
-4       0
+5      51
-5       0
+6       0
-6      38
+7       0
-7      50

[Weighted category diff]
+1      28
-1       0
+2       0
-2       0
+3       0
-3       1
+4      11
-4       0
+5      51
-5       0
+6       0
-6      39
+7       0
-7      50

show diff for ./en_user_log_phones_2011_08.csv
+1       4
+4       5
+5       7
-6       9
-7       7

The increase of false positives comes from the spaceless
typing test cases that are synthetic data.

Change-Id: I4ea77aa56ebfaa5518c71107169e1d2332de6327
2014-10-14 11:20:33 +09:00
Sandeep Siddhartha 19084d076a Cleanup LoginAccountUtils
Bug: 17464068
Change-Id: Icf994a7582491afebc5db522c127a30d079ce05c
2014-10-13 12:23:22 -07: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
Sandeep Siddhartha 1e10d29bc8 Don't restore device specific preferences
There are two categories of preferences:
1. That are part of the default shared preference
   They were all getting backed up and restored.
   Added a blacklist to not restore some of these.
   e.g. current account

2. That are in a non-default shared preference file.
   These are not getting backed up currently, but added a specific
   local preference file for all such preferences.

Bug: 17288591
Change-Id: I2f748be971a2337543e5014434aa39313fd1e1d8
2014-10-10 10:49:32 -07:00
Tadashi G. Takaoka 4f17f3df46 Fixing keyboard theme selection
Bug: 17937287
Change-Id: I476045980843c5897820cd544daea06fa991acb5
2014-10-10 17:42:03 +09:00
Jatin Matani eaf517ffea Merge "Changes related Sync Engine library that communicates to cloud server" 2014-10-09 18:06:32 +00:00
Jean Chalard bc18005948 Always show the typed word in recorrections.
Bug: 11330140
Bug: 17875601
Bug: 17623275
Change-Id: Ie4620f36f312c54c7b01b5f6cbdb0bc9171b6179
2014-10-09 17:54:58 +09:00
Jatin Matani db1b736446 Changes related Sync Engine library that communicates to cloud server
This change updates some of the code that the library uses
to communicate with the cloud server
Specifically :
- Update BlockingHttpClient to use template ResponseProcessor
- Update HttpUrlConnectionBuilder to setAuthToken for HttpUrlConnection

Bug: 17464069
Bug: 17464805

Change-Id: I7d7b58dff594b920162f799d102e8582ff9fe6a4
2014-10-09 00:01:32 -07:00
Jean Chalard 81a5a10476 [ML19] Actually switch the language when appropriate
That is, when auto-correcting or when manually picking.
This is not great, but it's a good starting point.

Bug: 11230254
Change-Id: I07627f48e2de1c28053d6572c7c72625808ec79c
2014-10-09 13:13:25 +09:00
Jean Chalard 38ec825ef8 [ML16] Remove DictionaryFacilitator.getLocale()
Bug: 11230254
Change-Id: Ife99df42bc145fbd2d5c3128330bc0f88b104de9
2014-10-07 16:44:26 +09:00
Adrian Velicu 639837f85d Merge "Postponing memory deallocation after onFinishInputView" 2014-10-06 23:45:40 +00:00
Yohei Yukawa db6c32778e Merge "Add a utility method to SuggestionSpanUtils" 2014-10-06 15:03:20 +00: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
Adrian Velicu 7b8f317050 Postponing memory deallocation after onFinishInputView
Bug: 17559789
Change-Id: I1d4b1524028164d27ec4eadd3960b567148f2b84
2014-10-06 23:14:48 +09:00
Jean Chalard fcc4cbf6f1 Merge "[ML14] Forward the locale list to relevant places, again" 2014-10-06 13:32:32 +00:00
Ken Wakasa 8784b4366e Merge "Revert "Remove preliminary subtypes from E-MR1 release"" 2014-10-06 12:53:14 +00:00
Ken Wakasa fe5132f783 Revert "Remove preliminary subtypes from E-MR1 release"
This reverts commit 704db5f003.

Bug: 17743363

Reverting due to unit test breakage..

Change-Id: Ie7c1e86e50af2a05b4b7877092122dc4f026aa54
2014-10-06 12:52:45 +00:00
Jean Chalard bc051a561f [ML14] Forward the locale list to relevant places, again
Diff:
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -735,7 +735,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> {

     private boolean matchLocaleCodes(TypedArray caseAttr, final Locale[] locales) {
         // TODO: adujst this for multilingual input
-        return matchString(caseAttr, R.styleable.Keyboard_Case_languageCode, locales[0].toString());
+        return matchString(caseAttr, R.styleable.Keyboard_Case_localeCode, locales[0].toString());
     }

     private boolean matchLanguageCodes(TypedArray caseAttr, Locale[] locales) {

Change-Id: Icefac18dd6d5fea97f591177cf8df1ba6de7f4f0
2014-10-06 21:27:32 +09:00
Keisuke Kuroyanagi 552470c882 Merge "Make sure to suppress BoS prediction until input twice." 2014-10-06 10:46:31 +00:00
Tadashi G. Takaoka 3215338fa0 Merge "Remove preliminary subtypes from E-MR1 release" 2014-10-06 10:45:32 +00:00
Tadashi G. Takaoka 704db5f003 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: I5f4b6fd8cbb8fa4e31df9ac602847c681655fd02
2014-10-06 10:44:59 +00:00
Keisuke Kuroyanagi 1c2f00f6b5 Make sure to suppress BoS prediction until input twice.
Change-Id: I98d91f264d5d1d3f5bcda1fd9ec885779ba2f746
2014-10-06 19:36:04 +09:00
Keisuke Kuroyanagi ca17ed7d9d Fix: BoS prediction is shown after inputting just once.
Change-Id: Ibba209f47cb5b1a4b08281689d607711b8dcfad4
2014-10-06 19:28:39 +09:00
Yohei Yukawa 03c1e7955a Add a utility method to SuggestionSpanUtils
This is a ground work for subsequent CLs.

BUG: 16995261
Change-Id: Icbb708a35412a635a0d625b520069840c0bb0904
2014-10-06 16:22:51 +09:00
Yohei Yukawa a48ff4e294 Merge "Add unittest for SuggestionSpanUtils" 2014-10-06 07:20:39 +00:00
Yohei Yukawa ceedaf6321 Add unittest for SuggestionSpanUtils
This adds unittest for SuggestionSpanUtils for subsequent CLs.
No behavior change is intended in this CL.

BUG: 16995261
Change-Id: I90d1591cab893a1421ca633963b7c8f00a5fe4b4
2014-10-06 12:24:46 +09:00
Keisuke Kuroyanagi 6accf63d0a Make unit tests use new entry updating method.
Bug: 14425059
Change-Id: Ie7d92e92822a0d3a8b654d213e55d45aab799f5d
2014-10-06 12:09:15 +09:00
Ken Wakasa faefad5b0f Revert "[ML14] Forward the locale list to relevant places"
This reverts commit 15dbd38283.

Bug: 11230254

Reverting due to unit test breakage.

Change-Id: Icf29ba5c808c754515aef2d1b4162d72f606acfe
2014-10-03 23:48:53 +00:00
Jean Chalard 15dbd38283 [ML14] Forward the locale list to relevant places
Bug: 11230254
Change-Id: Idf3ed27b396d63ade9800c72c5ce0ed613f5f669
2014-10-03 23:20:38 +09:00
Ken Wakasa 3a41528cbe Merge "Fix testCharacterTableIsPresent to use BinaryDictUtils.getDictFile" 2014-10-03 12:04:05 +00:00
Keisuke Kuroyanagi 73edc1eed9 Merge "Simplify dictionary creation in unit tests." 2014-10-03 11:42:58 +00:00
Akifumi Yoshimoto 6164f1fcb9 Fix testCharacterTableIsPresent to use BinaryDictUtils.getDictFile
Bug:17097992
Change-Id: Ic26c95fccb63d592883f85fe34f4570f1861b8c3
2014-10-03 20:07:41 +09:00
Keisuke Kuroyanagi ef903a81ac Simplify dictionary creation in unit tests.
Change-Id: Id1b41494701f54651d7f79aba426e15cca8d898d
2014-10-03 19:59:15 +09:00
Keisuke Kuroyanagi 2522a4a477 Fix: NPE in unit test.
Change-Id: I769b43f2afa1151d5c0d9c408018c3932be377dc
2014-10-03 19:53:23 +09:00
Akifumi Yoshimoto 80861cde9d Merge "Fix bug of testCharacterTableIsPresent (dicttool test)" 2014-10-03 10:07:04 +00:00
Akifumi Yoshimoto 71f9b8d50b Fix bug of testCharacterTableIsPresent (dicttool test)
Bug:17097992
Change-Id: Ibe343b8cc704631e84ed9d3a39feee30a54bdc38
2014-10-03 18:56:41 +09:00
Tadashi G. Takaoka 826186f66b Use Devanagari Danda letter as full stop on Nepali keyboard
Bug: 17741882
Change-Id: I62e8c9a3f194b9a3a6724c7d1a92292b150ddeb9
2014-10-03 09:48:18 +00:00
Jean Chalard b28d1cc487 Fix a behavior change in dicttool
The behavior change was introduced by I8b3458ad. Concretely,
empty bigram lists would end up as empty lists instead of null.

Change-Id: Ibcdf7e6aabc6aba3f5db0477335882394e050ce5
2014-10-03 18:04:10 +09:00
Jean Chalard fb051c3957 Merge changes I3c1f5ac1,I269c9aa8
* changes:
  Switch code point table
  Test for code point table (dicttool test)
2014-10-03 07:55:59 +00:00
Jean Chalard a4244df846 Merge "Add calls to stub for API to consume gesture data." 2014-10-03 07:26:25 +00:00
David Faden c92c883fdf Add calls to stub for API to consume gesture data.
Bug: 17400259
Change-Id: Ib3511afffe1d14662e7dd14611f384689516e664
2014-10-03 15:01:34 +09:00
Tadashi G. Takaoka 6959a0f214 Refactor keyboard layout unit tests
- Move predfined keys definitions to AbstractLayerBase and make it a
  top-level class.
- LayoutCustomizer extends AbstractLayoutBase that provides unit tests
  to access helper method and predefined key easily.
- Move shared layout custmizers to new layout.customizer package.
- Move private layout customizers to layout classes.

Change-Id: I9421cef1bedf5759fb0434842ac13a3fe3320b69
2014-10-03 10:44:26 +09:00
Akifumi Yoshimoto 7e5614520a Merge "Include a code point table in the binary dictionary." 2014-10-02 08:55:18 +00:00
Akifumi Yoshimoto f51d3667fc Switch code point table
Bug:17097992
Change-Id: I3c1f5ac183ebb5d3757b8ff258655869ab61f2e7
2014-10-02 12:28:04 +09:00
Akifumi Yoshimoto 25c884ba65 Test for code point table (dicttool test)
Bug:17097992
Change-Id: I269c9aa86378f32083f8688f4ce91862d47dd181
2014-10-02 12:28:04 +09:00
Akifumi Yoshimoto 9168ab60cf Include a code point table in the binary dictionary.
Bug:17097992
Change-Id: I677a5eb3a704e4386f6573360e44ca335d81d2df
2014-10-02 12:27:49 +09:00
Tadashi G. Takaoka f2c64cd644 Change package of subtype count unit test
Change-Id: Ie191c0607bb8388632fda5d276dd95f962676e3e
2014-10-02 12:25:50 +09:00
Tadashi G. Takaoka 2a6176fc65 Enable preliminary Sinhara keyboard for dogfood
Bug: 6911143
Change-Id: I38241d00567b25d1c6ba352f5b01eb8d8d532e0f
2014-10-01 09:36:56 +00:00
Tadashi G. Takaoka 31c16d41bc Add Uzbek keyboard
Bug: 13222403
Change-Id: I9a4cf447a8ab0c26c4dc7f7794c57390024660cc
2014-10-01 09:29:34 +00:00
Tadashi G. Takaoka a987f6d0cc Use Devanagari Danda letter as full stop on Hindi keyboard
Bug: 17418371
Change-Id: I22bb2913015a83604301576e68095974c38b7c9a
2014-10-01 18:20:31 +09:00
Tadashi G. Takaoka d368975cdb Merge "Add Akkhor Layout for Bengali Bangladesh" 2014-10-01 08:13:46 +00:00
Keisuke Kuroyanagi 108dad1491 Merge "Introduce NgramProperty in Java side." 2014-10-01 07:53:04 +00:00
Keisuke Kuroyanagi c6a6f6a990 Introduce NgramProperty in Java side.
Bug: 14425059
Change-Id: I8b3458ad22730b3dccbe0caea2c5930f5276dc82
2014-10-01 11:21:08 +09:00
Adrian Velicu 9586d69bdf Avoid double space when autocorrect is triggered
Bug: 17596034
Change-Id: Iaa6cc066eefd2436195a91791f2628e9a5f1c449
2014-09-30 15:48:48 +09:00
Akifumi Yoshimoto 0c2cdcc735 Fix bug of testCodePointTable.
Bug:17097992
Change-Id: Ia26bfceb008f52e2c3b760159c5129b7eca5d6d6
2014-09-30 12:49:25 +09:00
Akifumi Yoshimoto 5e828b2c61 Merge "Create a code point table based on occurrence counts." 2014-09-29 06:31:33 +00:00
Keisuke Kuroyanagi 6c7a85cb35 Quit using currentTimeMillis() for user history unit tests.
Change-Id: I24bd81e6781148302d5679850ed0a9bda71a3d27
2014-09-29 14:26:51 +09:00
Keisuke Kuroyanagi a4a4e9d96b Merge "Rename PrevWordsInfo to NgramContext." 2014-09-29 03:00:55 +00:00
Keisuke Kuroyanagi 33b0ebff27 Merge "Refactoring PrevWordsInfo." 2014-09-29 02:33:00 +00:00
Keisuke Kuroyanagi bb0eca5705 Rename PrevWordsInfo to NgramContext.
Bug: 14425059
Change-Id: Id06a71681fa8b5e589e29fba10fe5c1cfed66984
2014-09-29 10:52:18 +09:00
Tadashi G. Takaoka 76150b8133 Add Akkhor Layout for Bengali Bangladesh
Bug: 16143057
Change-Id: I0b4a3d0d1125f9af25a98ee7a1852129ae1c1d2c
2014-09-26 18:20:25 +00:00
Sandeep Siddhartha 569f6f1c9e Merge "Add authentication/http request related code to LatinIme" 2014-09-26 17:22:12 +00:00
Sandeep Siddhartha 05274d5a0d Add authentication/http request related code to LatinIme
Bug: 17464068
Bug: 17464805
Change-Id: I533ae8821e0628fdf6591538a96ab50f805c0cdf
2014-09-26 10:14:24 -07:00
Keisuke Kuroyanagi bbd6a26be0 Refactoring PrevWordsInfo.
Bug: 14425059
Change-Id: I48a193b965e3055bd10a00046322c2b7b19a6232
2014-09-26 21:46:57 +09:00
Tadashi G. Takaoka dade81d78c Fix adding more diacritics letters for Nordic languages
Bug: 10787354
Change-Id: Ia71417069a0cc10d7908d0c404ce85eb0cd76540
2014-09-26 20:21:17 +09:00
Tadashi G. Takaoka 207b979087 Merge "Add Serbian Latin keyboard" 2014-09-26 07:31:05 +00:00
Tadashi G. Takaoka 8108a3e1cd Add Serbian Latin keyboard
Bug: 9687668
Change-Id: I0631ab04cf33e3d454c965e98a756c31666537bf
2014-09-26 16:01:34 +09:00
Akifumi Yoshimoto fd4cb4bd05 Merge "Read dicttool option for switching code point table" 2014-09-26 06:38:32 +00:00
Akifumi Yoshimoto 8a6e96d286 Create a code point table based on occurrence counts.
Bug:17097992
Change-Id: Ifd76dbd4d385d800af416368e25c9e56a76d0fbf
2014-09-26 15:15:16 +09:00
Akifumi Yoshimoto f4329f7fff Read dicttool option for switching code point table
Bug:17097992
Change-Id: I0b3f12c4450f784b9a33470d1dc4c306062de91e
2014-09-26 15:15:10 +09:00
Tadashi G. Takaoka 90058c3d1f Add an internal state test to ImportantNoticeUtilsTests
On some 32bit-x86 testing emulators, it seems the internal state after
clear the related settings seems like a contradiction state. This CL
adds an test to check such internal state in order to investigate what
is happening on these emulators.

Bug: 17635340
Change-Id: Iba85f06c46959b1dc22e2a9213c50c9e7e30949b
2014-09-26 12:16:54 +09:00
Tadashi G. Takaoka dd052f006b Fix unit tests' size to @LargeTest for action label tests
Bug: 17654015
Change-Id: Id6a5030881603ad29cb38909f02ac3c0709c8aaf
2014-09-26 11:47:39 +09:00
Sandeep Siddhartha 3980675f18 Save/restore account preference when running tests
Change-Id: I0b1ec2144007b60fc53b4fcfa04be1b6dc21ced2
2014-09-25 11:47:28 -07:00
Tadashi G. Takaoka 88984aedae Split up long unit tests into smaller ones
Bug: 17654015
Change-Id: Ia2fe61554c1c5752fe38928ae6433ebaedcfdda7
2014-09-26 00:39:35 +09:00
Tadashi G. Takaoka aaefd56661 Add !string/<resource_name> reference
This CL introduces new text reference notation !string/<resource_name>
to refer a string resource on the fly.

This notation is mainly used to represent action key labels may refer
a string in a system locale in run-time.

This notation is needed to implement Hinglish and Serbian-Latin
keyboards that need to refer its own action key labels.

Bug: 17169632
Bug: 9687668
Change-Id: I042f6bd04714e0e448cd92031730eb9fb422e6d3
2014-09-25 18:27:23 +09:00
Tadashi G. Takaoka dbb2182e39 Introduce subtype filter to unit test
Change-Id: I3de573ffa38c46b78e1f8a602f99c49c164516f0
2014-09-25 18:26:21 +09:00
Keisuke Kuroyanagi 951252bf47 Merge "Get stats from dictionary." 2014-09-25 08:24:55 +00:00
Tadashi G. Takaoka 0be4e6e585 Add allowRedundantMoreKeys attribute
This CL also adds a couple of custom layout tests of Nordic languages.

Bug: 10787354
Change-Id: I5e875d3f30863395511afa82f0a02deb093d3a6f
2014-09-25 15:12:06 +09:00
Sandeep Siddhartha 145f05d637 Merge "Add account change receiver to handle account removal" 2014-09-24 23:40:58 +00:00
Sandeep Siddhartha d4aec65f65 Add account change receiver to handle account removal
Also cleanup the manifest to group similar components together.
Moving LoginAccountUtils to its own package

Bug: 17464068
Change-Id: Iad7928855531d58334b1e4039bb45b97dde75462
2014-09-24 13:10:54 -07:00
Tadashi G. Takaoka 51333ba4c3 Cleanup action key label unit tests
Change-Id: Iae08ef5689235310ad59035f4f19c6d631ca0602
2014-09-24 14:09:21 +09:00
Sandeep Siddhartha a2dbc44895 Merge "Handle split layout tests for phones" 2014-09-24 03:41:06 +00:00
Tadashi G. Takaoka 064ba6bc0a Merge "Fix Turkish/Azerbaijani keyboard to add more accented letters" 2014-09-24 03:36:10 +00:00
Keisuke Kuroyanagi a8321242c6 Call stopTestModeInNativeCode() in testDecaying().
Change-Id: I939fdbda31ff066ea6e807ad1438a8f77fb6ddef
2014-09-24 08:51:19 +09:00
Tadashi G. Takaoka 620bfb9bb9 am 4c4ba10b: am 71b51590: am a76e11a2: am 1f490d6c: am be4e0d0e: Fix when to show important notice
* commit '4c4ba10bbb257036d7cb6ae8a128263285b7384f':
  Fix when to show important notice
2014-09-23 16:18:45 +00:00
Sandeep Siddhartha b036224dbe Handle split layout tests for phones
Bug: 17577919
Change-Id: I060d81cfa11b9f9406f3d32307c7b949a057ffb3
2014-09-22 10:30:09 -07:00
Keisuke Kuroyanagi 504017e6dd Quit using try catch in addAndWriteRandomWords.
Change-Id: I1f3137bacf02bf6bad03a9a99fa56346ff0cd763
2014-09-22 17:39:45 +09:00
Adrian Velicu b12c174c2f Merge "Hiding SuggestedWords.EMPTY and refactoring code that compares SuggestedWords instances directly to it to use isEmpty instead" 2014-09-22 06:20:25 +00:00
Adrian Velicu 30f4a2a4d7 Hiding SuggestedWords.EMPTY and refactoring code that compares SuggestedWords instances directly to it to use isEmpty instead
Bug: 17560717
Change-Id: I7032bf0ab46f9cf5e3b3312a14e689b5496764c1
2014-09-22 14:50:21 +09:00
Keisuke Kuroyanagi b51412a05c Merge "Quit depending on SoftReference in UserHistoryDictionaryTests." 2014-09-22 05:44:42 +00:00
Tadashi G. Takaoka be4e0d0e39 Fix when to show important notice
This CL introduces a timeout duration to show an important notice
message. When the timeout has passed, the important notice message
will be suppressed without user intervention.

This CL also adds unit tests and fixes a bug in
getNextImportantNoticeTitle().

Bug: 17181982
Change-Id: If321c0060cc2f7ca14ad0631b84f4990f88bd659
2014-09-22 14:28:31 +09:00
Keisuke Kuroyanagi d80072c4b8 Quit depending on SoftReference in UserHistoryDictionaryTests.
Change-Id: I96533abf939d39873c5eaab9a9b02f71681aafcf
2014-09-22 14:22:37 +09:00
Tadashi G. Takaoka 8ea51a2760 Fix Turkish/Azerbaijani keyboard to add more accented letters
Bug: 16807005
Change-Id: Ifd0ab3aeb8207cdecacf8cfe5b1d58c07690142f
2014-09-22 10:55:08 +09:00
Keisuke Kuroyanagi 743a9b4499 Get stats from dictionary.
Bug: 16553957
Change-Id: I70c7a7be3c902dc8a0dfe8f946f9ef75ba6c9655
2014-09-22 10:26:19 +09:00
Keisuke Kuroyanagi 12a5c959b3 Add small unit test for adding/removing trigrams.
Bug:17097992
Change-Id: I0ed0b4a172130726d822dadb6d7a806b94130104
2014-09-19 19:16:33 +09:00
Sandeep Siddhartha 84185148c5 Add account listing and preference integration for current account
Bug: 17464068
Change-Id: Idb68a6012b285d6bc4632414bb6d11131148cf67
2014-09-18 10:39:30 -07:00
Sandeep Siddhartha 27bb70d6a0 Merge "Start showing the split keyboard layout" 2014-09-18 17:05:28 +00:00
Adrian Velicu 329dbe2239 Switching to AndroidJUnitRunner instrumentation
Bug: 16864527
Change-Id: I8a79a78f24cbc52935743311f5f0dceeb780358f
2014-09-18 19:57:18 +09:00
Sandeep Siddhartha 081c2d386d Start showing the split keyboard layout
Change [3/3]

Added tests for Qwerty/en-US/split

Parse the switch-case statement from KeyboardBuilder to use the right layout.

Bug: 4968173
Change-Id: If4d6d71d5900525290268d8affa55dccf1ebd4f2
2014-09-17 20:56:57 -07:00
Tadashi G. Takaoka 90f06760b9 Fix Romanian keyboard to promote "A with breve"
Bug: 17324498
Change-Id: Ie27f0023b2bfb18b0ee2051260ecf6bab75727a5
2014-09-18 11:48:29 +09:00
Tadashi G. Takaoka 7d64bc3455 Merge "Revert "Revert "Fall back to default keyboard theme""" 2014-09-17 11:51:19 +00:00
Tadashi G. Takaoka 311f12d024 Revert "Revert "Fall back to default keyboard theme""
This reverts commit 821486ba8b.

Change-Id: If0285c87edcd5f7d3c5449026953a74bf1125f65
2014-09-17 11:51:09 +00:00
Tadashi G. Takaoka c6cc000892 Merge "Revert "Fall back to default keyboard theme"" 2014-09-17 11:46:50 +00:00
Tadashi G. Takaoka 821486ba8b Revert "Fall back to default keyboard theme"
This reverts commit 6ed8b18326.

Change-Id: I48f775e54f4077e556b26bc0146bc918421c6845
2014-09-17 11:46:40 +00:00
Tadashi G. Takaoka e2a396eef0 Merge "Fall back to default keyboard theme" 2014-09-17 11:23:56 +00:00
Tadashi G. Takaoka 6ed8b18326 Fall back to default keyboard theme
Bug: 17537884
Change-Id: I3452d6d4a5837c6b2d417c8d256c121df86131cc
2014-09-17 19:36:22 +09:00
Jean Chalard 161080c029 Fix tests.
Looper.prepare() is not called automatically for us any more.

Bug: 17518123
Change-Id: I2fb6caa4ef79ce7ed86ff58518f4b000483e508f
2014-09-17 19:12:04 +09:00
Adrian Velicu f116f91033 Making spelling of the word "distracters" consistent
Bug: 17537869
Change-Id: Ibfc1c84aff72aeb76c9b127503369d00f3dfaceb
2014-09-17 17:32:43 +09:00
Ken Wakasa f81baec7ae Prepare for E MR1 that is linked against L SDK
Change-Id: I77e735a824718e96eac49359ae195c0ffa76b83d
2014-09-16 20:52:16 +09:00
Keisuke Kuroyanagi 89e34169f8 Get locale using detected language for personalization.
Bug: 16547557
Change-Id: If3d88a548e5a2255ff81c819b056f77bfbe237ae
2014-09-10 18:23:07 +09:00
Keisuke Kuroyanagi d843081193 Move case and OOV detection logic into distracter filter.
Bug: 16547557

Change-Id: I8502585976deb5e93fff3b1e0266654b8a927bda
2014-09-10 11:25:34 +09:00
Jean Chalard 1cf2acd8de am 61e7afa6: am 0eaa25e0: am 914078fd: Fix a bug where recorrection would stop on connectors
* commit '61e7afa6fa98939f9dcb9f7a2ebb5678a51d4201':
  Fix a bug where recorrection would stop on connectors
2014-09-08 13:20:27 +00:00
Jean Chalard b41ee67194 Fix the sentence separator for Hindi.
Change-Id: I623e4ccbc324751eb67ec4bb777e2be5ae2a60d1
Bug: 17418371
2014-09-08 21:54:28 +09:00
Jean Chalard 914078fd91 Fix a bug where recorrection would stop on connectors
Bug: 16733686
Change-Id: I7a9f79a81e33a1f5bf5f3daf0b78d0f1e4447e7a
2014-09-08 21:47:01 +09:00
Jean Chalard a1d2315499 Merge "Fix a bug with the Greek question mark." 2014-09-08 08:58:27 +00:00
Jean Chalard b526a894db Fix a bug with the Greek question mark.
Bug: 17398284
Change-Id: If49593e2c959935a183a4cd9d988407cc1160599
2014-09-08 15:33:51 +09:00
Tadashi G. Takaoka 6e259d560e am 82c8696f: am c7b8858e: am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev
* commit '82c8696f526d3ab121a7e8d188acf30ce6ae8e9c':
  Refactor action label/icon definitions
2014-09-05 17:23:44 +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
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 f7be68e636 am 06429878: am 464ff7c1: Add unit tests for enter key\'s more keys
* commit '06429878808f3e072ee34e97ac7a9085da9f8e79':
  Add unit tests for enter key's more keys
2014-09-03 17:55:58 +00:00
Tadashi G. Takaoka 8bc82177a5 am b506390b: am e8e08213: Merge "Add shared abstract test class for action label test" into lmp-dev
* commit 'b506390b3538fb6ef90cc91a9f5622f52c5e245d':
  Add shared abstract test class for action label test
2014-09-03 17:55:57 +00:00
Tadashi G. Takaoka 464ff7c131 Add unit tests for enter key's more keys
Bug: 15681452
Change-Id: I3070c46bb2c0cb8ccaae66eaea132b41c567e135
2014-09-04 00:18:14 +09:00
Tadashi G. Takaoka cd6f5ae566 Add shared abstract test class for action label test
Bug: 15681452
Change-Id: I0ad21e6979aed1b5c8c210399c4edfd5993adbdc
2014-09-03 23:55:36 +09: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
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 addc593349 Fix: PersonalizationDictionaryTests.
Change-Id: I2196c53d8e3ac3ab4c6c2f8e9320489b3a8bacd2
2014-08-29 21:40:59 +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
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
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
Tadashi G. Takaoka 07d1e9906e am aadb7a0e: am 5f19606d: Add action label tests in other locale than subtype\'s
* commit 'aadb7a0e03c22865f3af631e437202464aefb3f2':
  Add action label tests in other locale than subtype's
2014-08-28 09:42:11 +00:00
Tadashi G. Takaoka 5f19606d54 Add action label tests in other locale than subtype's
This unit test can catch the bug: 17310080.

Bug: 17310080
Change-Id: I931561217647fd558929b954ee1ef58c1d49df07
2014-08-28 17:36:26 +09:00
Jean Chalard f95770354c Straighten the dead char implementation, take 3.
Change-Id: I4f70f6eebe076c7d2b780d25e3a2c1d3faa2edfa
2014-08-28 16:03:45 +09:00
Tadashi G. Takaoka d9069ea076 Merge "Fix Hinglish subtype locale test" 2014-08-28 03:32:42 +00:00
Tadashi G. Takaoka e239500f51 Fix Hinglish subtype locale test
Change-Id: I6fc2fd4f04069485acc432ff957421b85083a344
2014-08-28 11:35:58 +09: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 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
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
Jean Chalard 96522da9eb am 2a2d324e: am 8380f921: Fix a bug where the top prediction would disappear.
* commit '2a2d324eb627807a9d09b491fbb4ac78ffb253fc':
  Fix a bug where the top prediction would disappear.
2014-08-26 12:37:17 +00:00
Jean Chalard 8380f921f7 Fix a bug where the top prediction would disappear.
This is because prediction can't be easily distinguished in
style. This fixes the bug by simulating the right members,
but some refactoring should be done to remove useless
booleans.

Bug: 17271923
Change-Id: Ib88f3fb95678021624e59535492926dd315d26fb
2014-08-26 20:35:59 +09:00
Jean Chalard 1a31d784cd Merge "Introduce onEvent() to improve testability" 2014-08-25 09:57:42 +00:00
Jean Chalard ee8ebeecbf Merge "Fix unit tests" 2014-08-25 09:26:17 +00:00
Jean Chalard dc110b2a6a Fix unit tests
Change-Id: I48bfa4e4dd80f36d2fe0a1e9d2a2706533cc722e
2014-08-25 18:19:00 +09:00
Tadashi G. Takaoka ef7c701e72 am 129af927: am 5e7a6fe0: Merge "Fix the bottom row of tablet keyboard layout" into lmp-dev
* commit '129af92713c59016d13b957e55ce089984ccc4e8':
  Fix the bottom row of tablet keyboard layout
2014-08-25 08:25:32 +00:00
Yohei Yukawa c06c6e42ad am 7d146cdb: am cd6ef9a8: Indroduce SuggestedWords#getTypedWordInfoOrNull
* commit '7d146cdbe86692f153fb5b7f781f701a8c04050d':
  Indroduce SuggestedWords#getTypedWordInfoOrNull
2014-08-25 08:25:24 +00:00
Jean Chalard 908f0ed154 Introduce onEvent() to improve testability
...and prepare for the future

Change-Id: Ieed96ab552993fd148e80b9c3355f1b569bd716f
2014-08-25 16:33:47 +09:00
Jean Chalard dc44260484 Merge "Revert "Revert "[ML1] Introduce RichInputMethodSubtype""" 2014-08-25 05:24:28 +00:00
Jean Chalard 85ddfe1317 Revert "Revert "[ML1] Introduce RichInputMethodSubtype""
This reverts commit a63d0a8ee6.

This patch seems to be fine after all, but was submitted without its companion [ML1.1] patch causing a build breakage. Reverting the revert and submitting both at the same time seems like the right thing to do.

Change-Id: Ib8fefa40b74dcee0edb025a52dac9b35c82d49df
2014-08-25 04:42:15 +00:00
Tadashi G. Takaoka 5e7a6fe098 Merge "Fix the bottom row of tablet keyboard layout" into lmp-dev 2014-08-25 03:45:35 +00:00
Tadashi G. Takaoka c9aa1beb6d Fix the bottom row of tablet keyboard layout
This CL eliminates "_" and "/" keys from the bottom row of tablet
keyboard.  This CL also reorganizes the bottom row of tablet Dvorak
keyboard.

Bug: 16603887
Change-Id: Ic1570836dea1a475bed5d43aeb6a351507bf5428
2014-08-25 12:34:58 +09:00
Yohei Yukawa cd6ef9a8b1 Indroduce SuggestedWords#getTypedWordInfoOrNull
This is a groundwork for subsequent CLs whith need to
do certain things for and only for the typed word.

Change-Id: I374b79cbc79470f57f523c996010301ea5701a61
2014-08-24 16:32:17 -07:00
Tadashi G. Takaoka 560876508f am cc4d21df: am 2637be27: Support Accept typed word UI
* commit 'cc4d21df7b08c3143dd1c4af786609a279a0bb79':
  Support Accept typed word UI
2014-08-22 14:27:26 +00:00
Tadashi G. Takaoka 2637be27c5 Support Accept typed word UI
Change-Id: I58e95b2791a45afdc7dae8e26dcfc200b3b4b854
2014-08-22 21:25:35 +09:00
Jean Chalard a63d0a8ee6 Revert "[ML1] Introduce RichInputMethodSubtype"
This reverts commit 8ffe4bc932.

Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f
2014-08-22 09:40:27 +00:00
Jean Chalard 8ffe4bc932 [ML1] Introduce RichInputMethodSubtype
Bug: 11230254
Change-Id: Ic7a1bf938a5a186dcff527b556295aba2406e8b9
2014-08-22 16:34:27 +09:00
Tadashi G. Takaoka ebec5e1338 Merge "Add Hinglish (hi_ZZ) subtype" 2014-08-21 10:22:17 +00:00
Tadashi G. Takaoka d6696ae78b Add Hinglish (hi_ZZ) subtype
Bug: 17169632
Change-Id: Ibee088d76c2b19f1d62a3c9c119452726e856ec8
2014-08-21 19:12:25 +09:00
Keisuke Kuroyanagi ed798fa308 Remove unused dictionary writing methods.
Change-Id: Ica6ac057c0d0f037b7dd5539ab5b591c83bfa4d7
2014-08-21 17:22:54 +09:00
Jean Chalard 36c02f862a Merge "Fix the name of a class" 2014-08-16 04:12:14 +00:00
Jean Chalard 650770da2c Fix the name of a class
Change-Id: I6a6360c3e606ae331b95df17ecf35942be2b89a9
2014-08-19 22:08:59 +09:00
Keisuke Kuroyanagi ffaa9c2a71 Merge "Add language to PersonalizationDataChunk." 2014-08-16 04:12:14 +00:00
Keisuke Kuroyanagi e66d59e6d8 Add language to PersonalizationDataChunk.
Bug: 16547557
Change-Id: I11b82667631cbd5263cc08ccb304fc97bf692050
2014-08-19 18:27:34 +09:00
Keisuke Kuroyanagi a4fb0cc266 Add retry for dict file existence tests.
Change-Id: Ife8d30e1de22336ea87faadb8c6ad7451679337b
2014-08-15 17:55:27 +09:00
Keisuke Kuroyanagi 5409957440 Merge "Remove unigram for v402 with historical info." 2014-08-15 05:02:04 +00:00
Keisuke Kuroyanagi 8890b01550 Remove unigram for v402 with historical info.
Bug: 15531638
Change-Id: If1b73ac693e45a80df987ea16b2dece5597697e8
2014-08-15 15:47:53 +09:00
Jean Chalard 3dbc3ece26 am e04c8b10: am b8d76477: Add the input style to SuggestedWords.
* commit 'e04c8b10d7876effbfdf2340a1fec6bf368c3409':
  Add the input style to SuggestedWords.
2014-08-14 18:10:05 +00:00
Jean Chalard b8d764772b Add the input style to SuggestedWords.
Change-Id: I81f37d08659d449822b027d3d5912e11eec8b8ff
2014-08-14 17:53:04 +09:00
Tadashi G. Takaoka af078ce7b4 am 1901c331: am a94c89e0: Use light emoji icon for Material light tablet keyboard
* commit '1901c331283e2f60e6277a7773a103a447bd31ca':
  Use light emoji icon for Material light tablet keyboard
2014-08-13 15:54:51 +00:00
Tadashi G. Takaoka a94c89e017 Use light emoji icon for Material light tablet keyboard
Bug: 16808603
Change-Id: I39ce0ed8b5580754dfd0cf1494289b0a23863d50
2014-08-14 00:25:34 +09:00
Tadashi G. Takaoka 78cff10f8d Add BuildCompatUtils to get an effective platfrom API version
This CL removes reference of VERSION_CODES.CUR_DEVELOPMENT.

Bug: 13888366
Change-Id: I5c8499a175473a220c8fb04ead219760c585a19a
2014-08-13 16:21:23 +09:00
Tadashi G. Takaoka 8f3e778a21 Revert "Remove reference of VERSION_CODES.CUR_DEVELOPMENT"
This reverts commit 5380acfd04.

Bug: 13888366
Change-Id: Iae0fb6798cef9d59c9de3790123f6acaf8b2746b
2014-08-13 04:00:36 +00:00
Keisuke Kuroyanagi 82be1873f1 Merge "Add additional wait for writing file in testAddManyWords()." 2014-08-12 23:14:42 +00:00
Tadashi G. Takaoka 089371b649 am bdb05cc8: am 78cff10f: Add BuildCompatUtils to get an effective platfrom API version
* commit 'bdb05cc89f63f4f3956936fa062d0b4555aa072a':
  Add BuildCompatUtils to get an effective platfrom API version
2014-08-13 07:52:52 +00:00
Keisuke Kuroyanagi 18c562871f Merge "Print files when dict file existence check is failed." 2014-08-12 23:14:48 +00:00
Keisuke Kuroyanagi caee2c1876 Print files when dict file existence check is failed.
Change-Id: Id71f239afa95b68961192714998695c21ed48002
2014-08-13 15:51:34 +09:00
Keisuke Kuroyanagi 7185f30a5c Remove all test dictionary files before and after unit test.
Change-Id: I92db6318daa98684639ab959f55d047a941fe265
2014-08-13 15:51:16 +09:00
Keisuke Kuroyanagi 24cb234778 Merge "Remove all test dictionary files before and after unit test." 2014-08-12 23:14:42 +00:00
Tadashi G. Takaoka 4ac551d189 am 7edc27f1: am 8f3e778a: Revert "Remove reference of VERSION_CODES.CUR_DEVELOPMENT"
* commit '7edc27f17b450e690f08a972c4573b92b39ef7ee':
  Revert "Remove reference of VERSION_CODES.CUR_DEVELOPMENT"
2014-08-13 05:28:51 +00:00
Tadashi G. Takaoka 89a2145448 am a70542a5: am 5380acfd: Remove reference of VERSION_CODES.CUR_DEVELOPMENT
* commit 'a70542a5ef2c7f4d5cfe62150ed17be3776904c5':
  Remove reference of VERSION_CODES.CUR_DEVELOPMENT
2014-08-12 15:02:59 +00:00
Tadashi G. Takaoka 5380acfd04 Remove reference of VERSION_CODES.CUR_DEVELOPMENT
Bug: 13888366
Change-Id: I0b829e2cf9a11c694cf01b6f02753233c9c85105
2014-08-12 23:13:18 +09:00
Keisuke Kuroyanagi 9f584e15eb Add additional wait for writing file in testAddManyWords().
Change-Id: Ibb79b9821dac3d48e18c684e8aca605254bec045
2014-08-12 22:29:02 +09:00
Tadashi G. Takaoka 7ad1fb2a43 Fix typo in keyboard layout test comment
Change-Id: Ib7800840dd8f2d37a0ef7e03d67f16490f9c0dea
2014-08-12 22:15:25 +09:00
Tadashi G. Takaoka e1758f8cdf Disable Sinhala keyboard for E-release
This CL also disables Tamil (Sri Lanka) subtype in conjunction with
Sinhala (Sri Lanka) subtype.

Bug: 6911143
Bug: 9978106
Change-Id: Ie56051eb04141114ca02c72b256942a838e38721
2014-08-11 20:16:16 +09:00
Tadashi G. Takaoka c9add10c38 (DO NOT MERGE) Disable Sinhala keyboard for L-release
This CL also disables Tamil (Sri Lanka) subtype in conjunction with
Sinhala (Sri Lanka) subtype.

Bug: 6911143
Bug: 9978106
Change-Id: I686b4e5d2c79039ca8d837d3227448d69c7e47de
2014-08-11 11:14:07 +00:00
Tadashi G. Takaoka 463339f195 resolved conflicts for merge of aca5785a to master
Change-Id: I01e8af21d6d019859da4a05995e77701a0d9c585
2014-08-11 19:34:23 +09:00
Tadashi G. Takaoka 25906373ff Fix Tamil keyboard
This CL adds Tamil (Sri Lanka) and Tamil (Singapore) subtypes.
This CL also fixes Sinhala Keyboard's currency symbol.

Bug: 9978106
Bug: 6911143
Change-Id: I2060978097882d0f4b1ec10f1103260ed8a447d0
2014-08-11 18:07:27 +09:00
Tadashi G. Takaoka e5e1e70015 am a23dda38: am 2863997a: Fix Kannada keyboard
* commit 'a23dda38a04d8fe7402c1866c97bc53d7540f22b':
  Fix Kannada keyboard
2014-08-11 08:07:19 +00:00
Tadashi G. Takaoka 2863997abd Fix Kannada keyboard
Bug: 10029252
Change-Id: I5ae056ca6ada4ffb921e9882bf57ad21a9bb4d47
2014-08-11 15:51:56 +09:00