nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
33706 commits 1 branch 0 tags 363 MiB
Commit graph

12069 commits

Author SHA1 Message Date
Tadashi G. Takaoka
d368975cdb Merge "Add Akkhor Layout for Bengali Bangladesh" 2014-10-01 08:13:46 +00:00
Tadashi G. Takaoka
f41c11a5c0 Merge "Fix when to show more suggestions dot hint" 2014-10-01 07:58:28 +00:00
Tadashi G. Takaoka
0487290f0f Merge "Fix NPE in KeyboardParams" 2014-10-01 07:54:47 +00:00
Keisuke Kuroyanagi
108dad1491 Merge "Introduce NgramProperty in Java side." 2014-10-01 07:53:04 +00:00
Tadashi G. Takaoka
23b35a9689 Fix when to show more suggestions dot hint 
Bug: 17742406
Change-Id: Ifdf5d196778da2bb9bb9e3ca9250d23857d90bab
 2014-10-01 16:50:28 +09:00
Tadashi G. Takaoka
dbf5701ee0 Fix NPE in KeyboardParams 
Bug: 17707885
Change-Id: Ie6a54ac5ab60f5d11363ac8da8eef850d65dba7c
 2014-10-01 16:08:58 +09:00
Jean Chalard
9d92d3e02d Avoid downloading the metadata in quick succession. 
Bug: 17668298
Bug: 8651816
Bug: 17709442
Change-Id: Ib232f9d95d7c01a028be85d10f974a5a570c0ed5
 2014-10-01 12:20:27 +09:00
Baligh Uddin
d1e19ee755 Import translations. DO NOT MERGE 
Change-Id: I69c02deb213419a95c464fb6ee45646611675d79
Auto-generated-cl: translation import
 2014-09-30 20:09:31 -07:00
Baligh Uddin
e347b65e0f Import translations. DO NOT MERGE 
Change-Id: I61b5124ffbdc073a093f55702b773c1cc8fd6046
Auto-generated-cl: translation import
 2014-09-30 20:06:07 -07:00
Baligh Uddin
d3a5b55ba7 Import translations. DO NOT MERGE 
Change-Id: Id3f3a910f5503eb21582d5f8eb376948ac753470
Auto-generated-cl: translation import
 2014-09-30 20:02:12 -07:00
Baligh Uddin
6041d899bf Import translations. DO NOT MERGE 
Change-Id: I3e80f9e306fe210f8f0cb1e56d7306e2b44ee493
Auto-generated-cl: translation import
 2014-09-30 19:55:36 -07:00
Yohei Yukawa
7b673c7265 am 5139c4fd: am 702a736e: am 31838876: am 9baaa4b5: am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev 
* commit '5139c4fd28d1a34981d590f2fbec9b407481ea52':
  Fix NPE due to the lack of null-check
 2014-10-01 02:26:35 +00:00
Keisuke Kuroyanagi
c6a6f6a990 Introduce NgramProperty in Java side. 
Bug: 14425059
Change-Id: I8b3458ad22730b3dccbe0caea2c5930f5276dc82
 2014-10-01 11:21:08 +09:00
Yohei Yukawa
9baaa4b5c7 am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev 
* commit '6ad437edd93382ce872c42fc8a2126e34dbf98d9':
  Fix NPE due to the lack of null-check
 2014-10-01 00:51:40 +00:00
Jatin Matani
0187db39b5 Merge "Add StatsUtils#onLoadSettings for when settings are changed" 2014-10-01 00:41:32 +00:00
Jatin Matani
cc7e44e34c Add StatsUtils#onLoadSettings for when settings are changed 
Non-blocking call in nature.
Bug:17013677

Change-Id: Iff737422bbacbf22c9b0ff6eaf1c1f75e6bf23c3
 2014-09-30 17:09:00 -07:00
Adrian Velicu
9586d69bdf Avoid double space when autocorrect is triggered 
Bug: 17596034
Change-Id: Iaa6cc066eefd2436195a91791f2628e9a5f1c449
 2014-09-30 15:48:48 +09:00
Yohei Yukawa
6ad437edd9 Merge "Fix NPE due to the lack of null-check" into lmp-dev 2014-09-30 00:41:24 +00:00
Baligh Uddin
5dd9e4ae15 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 17:16:18 +00:00
Baligh Uddin
1222cac5a3 Import translations. DO NOT MERGE 
Change-Id: Iaee29fb909327ab892f1b5c88cac0f9f0bd62ea3
Auto-generated-cl: translation import
 2014-09-29 01:45:51 -07:00
Baligh Uddin
961470ff88 Import translations. DO NOT MERGE 
Change-Id: I2865485fc1e9c76ecdc2f138f04bae77691e8d3f
Auto-generated-cl: translation import
 2014-09-29 01:40:51 -07:00
Yohei Yukawa
de12c1bf49 Fix NPE due to the lack of null-check 
The case that was not coverted well is that
CursorAnchorInfoCompatWrapper could be instantiated
with null object. In such situations, we should
do nothing.

BUG: 17682582
Change-Id: I6625a2f0ed8c5580ed9edfe4728f342da77a8e40
 2014-09-29 17:03:29 +09:00
Tadashi G. Takaoka
4936d259d7 Merge "Fix verbalizing missing emoticons" 2014-09-29 06:39:30 +00:00
Akifumi Yoshimoto
5e828b2c61 Merge "Create a code point table based on occurrence counts." 2014-09-29 06:31:33 +00:00
Tadashi G. Takaoka
d9d5ba4287 Fix verbalizing missing emoticons 
Bug: 15585153
Change-Id: I8ae184047558d1a78e20efde0b08e40beb4458b9
 2014-09-29 15:15:18 +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
8108a3e1cd Add Serbian Latin keyboard 
Bug: 9687668
Change-Id: I0631ab04cf33e3d454c965e98a756c31666537bf
 2014-09-26 16:01:34 +09: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
Tadashi G. Takaoka
1c70a8e147 Merge "Add info log of custom input styles" 2014-09-26 03:56:22 +00:00
Tadashi G. Takaoka
10a93dc80c Add info log of custom input styles 
Bug: 17622871
Change-Id: Ia97c7bc2f0923417b458b178fbd8776d5cd0758c
 2014-09-26 12:51:42 +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
Sandeep Siddhartha
d0a144282e Add the sync related permissions to LatinIme too 
This can go in master because the actual code changes will also go in here,
and not in lmp-dev

Bug: 17464069
Change-Id: Ica1a22c61aa07efb6dadf8db53513607be437b73
 2014-09-25 10:30:31 -07:00
Tadashi G. Takaoka
f99cce8615 Merge "Fix checking a11y status just before calling an a11y method" 2014-09-25 14:14:28 +00: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
04cd8794e0 Fix checking a11y status just before calling an a11y method 
Bug: 17035860
Change-Id: I9627d525a570ced085281b4db93fe6896081e818
 2014-09-25 18:24:17 +09:00
Keisuke Kuroyanagi
951252bf47 Merge "Get stats from dictionary." 2014-09-25 08:24:55 +00:00
Tadashi G. Takaoka
22e2fa372c Merge "Add allowRedundantMoreKeys attribute" 2014-09-25 08:20:19 +00:00
Jean Chalard
2828d9eda7 Merge "[ML10.1] Adjust call for additional features" 2014-09-25 08:19:47 +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
Jean Chalard
8da2052113 [ML10.1] Adjust call for additional features 
Bug: 11230254
Change-Id: I7b60d9174d7d267eb1b3cd848cff36cdbea75b12
 2014-09-25 12:50:11 +09:00
Keisuke Kuroyanagi
a40db55d9b Merge "Fix typo." 2014-09-25 02:52:12 +00:00
Keisuke Kuroyanagi
97465afbf8 Fix typo. 
Change-Id: Ib090a3dfa7e53232e0d1ef5e4d2cbe48130f657f
 2014-09-25 11:50:30 +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
21f038ee0a Stop showing more suggestions while important notice is showing 
Bug: 15812659
Change-Id: I314e235cfffae3ae655320a9a75867efc28066bf
 2014-09-24 14:12:05 +09:00
Tadashi G. Takaoka
064ba6bc0a Merge "Fix Turkish/Azerbaijani keyboard to add more accented letters" 2014-09-24 03:36:10 +00:00
Tadashi G. Takaoka
9a73a79cbe Merge "Fix not intercepting touch event while in modal mode" 2014-09-24 03:24:18 +00:00
Jean Chalard
3db17c5394 Merge "[ML9.1] Add option for multi-lingual support" 2014-09-24 02:42:46 +00: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
Keisuke Kuroyanagi
9997853d6f Merge "Prepare supporting n-gram for user history dictionary." 2014-09-23 10:18:41 +00:00
Jatin Matani
e2e48eb9b3 Merge "Add StatsUtilManager.onStartInput & onFinishInput" 2014-09-22 16:15:14 +00:00
Keisuke Kuroyanagi
ddfaeff544 Prepare supporting n-gram for user history dictionary. 
Bug:17097992
Change-Id: Ic8bfde3d4cc0e720bf7681e08e16fb2ad94d5670
 2014-09-22 18:18:50 +09:00
Jean Chalard
4b0dba4cd8 [ML9.1] Add option for multi-lingual support 
Bug: 11230254
Change-Id: I15d42fad155142fa6f556f13e84cad489be00dbd
 2014-09-22 17:41:37 +09:00
Tadashi G. Takaoka
1f490d6c10 am be4e0d0e: Fix when to show important notice 
* commit 'be4e0d0e3921af3d575f745cb356704974362baf':
  Fix when to show important notice
 2014-09-22 07:28:43 +00:00
Tadashi G. Takaoka
d144b7874e Fix not intercepting touch event while in modal mode 
Bug: 17600156
Change-Id: Ife8f04550411d88311e08dd33e370a410d791ca2
 2014-09-22 15:30:29 +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
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
Tadashi G. Takaoka
5fa6a538cc Add plus-sign hint to PIN's zero key 
Bug: 16378846
Change-Id: Ia1f95a33db4e1eb6b2fe367cfffa4aada567b6d9
 2014-09-22 14:05:28 +09:00
Jatin Matani
6a6137325b Add StatsUtilManager.onStartInput & onFinishInput 
Bug:15657192
Change-Id: I6e976202812d1c1675bd7822c4a15686d1ec1fe9
 2014-09-21 20:19:12 -07:00
Keisuke Kuroyanagi
825747348b Merge "Create DictionaryStats in executor." 2014-09-22 02:49:04 +00:00
Mohammadinamul Sheik
8f116d7cda Merge "Invoke onWordCommitUserTyped on startInput() with non empty wordcomposer" 2014-09-22 02:13:21 +00: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
c724864c61 Create DictionaryStats in executor. 
Bug: 16553957
Change-Id: Ie4e9a6ee67f90ba0086af2075068e078efc7f189
 2014-09-22 10:25:51 +09:00
Baligh Uddin
1c810c6725 Import translations. DO NOT MERGE 
Change-Id: I51bc9a71a30b362938d155e091a7b0d4694eacbf
Auto-generated-cl: translation import
 2014-09-21 04:15:07 -07:00
Baligh Uddin
cf59579cf5 Import translations. DO NOT MERGE 
Change-Id: I5c04251f5db42dab2189da52895e171c9082348b
Auto-generated-cl: translation import
 2014-09-21 04:12:17 -07:00
Yohei Yukawa
c514d64bff am d8c83fb8: am 88cae78f: am 89dd5f03: am c1d35148: am f2d0d9b0: Merge "Avoid the add-to-dictionary indicator from being clipped" into lmp-dev 
* commit 'd8c83fb81bb06e22ab0857e1a7531c666ad8701e':
  Avoid the add-to-dictionary indicator from being clipped
 2014-09-20 04:46:48 +00:00
Baligh Uddin
3c52bf7ddf Merge "Import translations. DO NOT MERGE" 2014-09-20 04:35:35 +00:00
Baligh Uddin
b0388e81ed Merge "Import translations. DO NOT MERGE" 2014-09-20 04:35:35 +00:00
Baligh Uddin
ab63e0c01d Merge "Import translations. DO NOT MERGE" 2014-09-20 04:35:35 +00:00
Baligh Uddin
ed04bd9ef6 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-20 04:35:32 +00:00
Baligh Uddin
5bb9b99d52 Merge "Import translations. DO NOT MERGE" 2014-09-20 04:35:26 +00:00
Baligh Uddin
c7dc7bccf4 Merge "Import translations. DO NOT MERGE" 2014-09-20 04:35:23 +00:00
Yohei Yukawa
c1d3514891 am f2d0d9b0: Merge "Avoid the add-to-dictionary indicator from being clipped" into lmp-dev 
* commit 'f2d0d9b0b91953df440ed55e0ee2e7f67705a881':
  Avoid the add-to-dictionary indicator from being clipped
 2014-09-20 04:04:43 +00:00
Yohei Yukawa
f2d0d9b0b9 Merge "Avoid the add-to-dictionary indicator from being clipped" into lmp-dev 2014-09-20 03:58:03 +00:00
Tadashi G. Takaoka
ed7e5bdd65 Revert "Disable preliminary subtypes on E-release" 
This reverts commit 0e6dd1a6f1.
This CL enables the following preliminary subtypes.
  - hi_ZZ: Hinglish
  - my_MM: Myanmar

Bug: 17587199
Change-Id: I6a2e621f1d50715b1b379fe2a19c48dac022eb92
 2014-09-20 03:35:05 +00:00
Tadashi G. Takaoka
0e6dd1a6f1 Disable preliminary subtypes on E-release 
This CL disables the following preliminary subtypes.
  - hi_ZZ: Hinglish
  - my_MM: Myanmar

Bug: 17587199
Change-Id: Ib7c88fc4817b79f8e46b5d499c6bb748c24d6c7d
 2014-09-20 03:27:45 +00:00
Jean Chalard
4328cd88d4 am c648bae1: (DO NOT MERGE) Remove some logs which spam encrypted boot 
* commit 'c648bae15de599e76d865fd181e980fc1b2175b3':
  (DO NOT MERGE) Remove some logs which spam encrypted boot
 2014-09-20 01:36:08 +00:00
Yohei Yukawa
9d2f606aa8 Avoid the add-to-dictionary indicator from being clipped 
With this CL, the display bounds is taken into consideration
when the location of add-to-dictionary indicator is determined.

BUG: 17578360
Change-Id: I31e458fa7bbc33e539578b331fe1c51ff7f8668e
 2014-09-19 19:19:56 +09:00
Keisuke Kuroyanagi
845c061970 Fix unit tests. 
Change-Id: I7706db4c9279488552ea5fabc16dd1dd2bc7fa05
 2014-09-19 19:02:08 +09:00
Jean Chalard
c648bae15d (DO NOT MERGE) Remove some logs which spam encrypted boot 
Bug: 17539539
Change-Id: Idb442c2f0db2361b8e535f39b02d209b1edd1069
(cherry picked from commit 4b6c6fa0e4)
 2014-09-19 07:29:03 +00:00
Mohammadinamul Sheik
6901ea6eac Invoke onWordCommitUserTyped on startInput() with non empty wordcomposer 
In chat clients, the last committed word is not committed via
rich input connection. This will handle those missed out cases.

Change-Id: If3f1f6e1927cdf56a09d3e9124f05c66ca75de53
 2014-09-18 23:00:11 -07:00
Adrian Velicu
bacf2dbac6 Merge "Added @UsedForTesting to 'missing' methods to avoid ProGuard removing them" 2014-09-19 05:39:31 +00:00
Adrian Velicu
8c889784e2 Added @UsedForTesting to 'missing' methods to avoid ProGuard removing them 
Bug: 16864527
Change-Id: I698a1b3e09e7e9a12722169b37f87bd51c8cbd34
 2014-09-19 14:31:33 +09:00
Jean Chalard
17511a41a4 Merge "[ML8] Add a language weight" 2014-09-19 05:15:51 +00:00
Jean Chalard
4b6c6fa0e4 Remove some logs which spam encrypted boot 
Bug: 17539539
Change-Id: Idb442c2f0db2361b8e535f39b02d209b1edd1069
 2014-09-19 14:02:23 +09:00
Jean Chalard
6da9b21191 [ML8] Add a language weight 
...and rename an improperly named normalization value

Bug: 11230254
Change-Id: I0f5633148a9f66dbfd7d28540b8a8985131c4549
 2014-09-19 13:44:42 +09:00
Tadashi G. Takaoka
bd46e3f2e3 am 00e01837: Merge "(DO NOT MERGE) Fix showing important notice even at beginning of sentence" into lmp-dev 
* commit '00e018370fdc3b66a7937a3f08197cedb7907c19':
  (DO NOT MERGE) Fix showing important notice even at beginning of sentence
 2014-09-18 22:57:20 +00:00
Tadashi G. Takaoka
00e018370f Merge "(DO NOT MERGE) Fix showing important notice even at beginning of sentence" into lmp-dev 2014-09-18 22:48:10 +00:00
Mohammadinamul Sheik
0e9419d014 Add word commit methods to StatsUtils 
Change-Id: Ibb2cf0150cd9a851ff48d097688edc916dc82998
 2014-09-18 13:06:38 -07: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
Sandeep Siddhartha
a7c5dcdedf Merge "Add Accounts & privacy settings in LatinIME" 2014-09-18 16:49:34 +00:00
Keisuke Kuroyanagi
6624ea96f7 Merge "Pass prevWordCount to native code for getSuggestion." 2014-09-18 13:01:35 +00:00
Keisuke Kuroyanagi
8806248386 Pass prevWordCount to native code for getSuggestion. 
Bug: 14425059
Change-Id: Id2b49a448982c997e5c0a22445b115e675156c3e
 2014-09-18 19:18:55 +09:00
Tadashi G. Takaoka
0055d26164 Merge "Fix showing important notice even at beginning of sentence" 2014-09-18 10:01:49 +00:00
Tadashi G. Takaoka
f4c7eb478f Fix showing important notice even at beginning of sentence 
This is a cherry-pick of Ic72d6fecc3 from lmp-dev.

Bug: 17536096
Change-Id: Id76b8f8dc85d03bc7ed5f24800301c081a82a8d2
 2014-09-18 18:51:23 +09:00
Tadashi G. Takaoka
26b3d1de7e (DO NOT MERGE) Fix showing important notice even at beginning of sentence 
Bug: 17536096
Change-Id: Ic72d6fecc3241c1a9aba87b82a46750cbd69e001
 2014-09-18 09:45:37 +00:00
David Faden
5dda75b538 Add methods to get a Key's horizontal and vertical gaps. 
Record the horizontal and vertical gap for the key, adding
corresponding accessors. This info is helpful in interpreting
corresponding touch points data.

Bug: 17400259
Change-Id: I825c537a48db35baab71580ff5c41cd911094a4b
 2014-09-18 09:40:02 +00:00
Yohei Yukawa
eddfe51b38 resolved conflicts for merge of 233a2f21 to master 
Change-Id: If391cc622367dfb4448c6a5c32b82111d352d86e
 2014-09-18 18:27:45 +09:00
Jean Chalard
cdabc71c6d Merge "Add a Dictionary.isUserSpecific method." 2014-09-18 08:52:07 +00:00
David Faden
0c837daee6 Add a Dictionary.isUserSpecific method. 
As the name suggests, returns true if the Dictionary is of a type
that may use user-specific data, e.g., contacts.

Cherry-pick of I11e71286c7635f50ace156dcc5308dbe51268d4e

Change-Id: I08c3f22f0c34eaa71bbd06594314f3b411658c5c
 2014-09-18 17:42:37 +09:00
Yohei Yukawa
8c9948f436 am fa63d910: Merge "Use Add-To-Dictionary indicator only" into lmp-dev 
* commit 'fa63d910950621d820d28b177a9de199e492557c':
  Use Add-To-Dictionary indicator only
 2014-09-18 07:22:15 +00:00
Yohei Yukawa
d04271e7fc am fa63d910: Merge "Use Add-To-Dictionary indicator only" into lmp-dev 
* commit 'fa63d910950621d820d28b177a9de199e492557c':
  Use Add-To-Dictionary indicator only
 2014-09-18 07:21:33 +00:00
Yohei Yukawa
fa63d91095 Merge "Use Add-To-Dictionary indicator only" into lmp-dev 2014-09-18 07:13:42 +00:00
Yohei Yukawa
5896153f93 Use Add-To-Dictionary indicator only 
With this CL, the previously used commit indicator was reverted.
Instead we use the add-to-dictionary indicator only at the moment.

This CL also fixes the indicator position in bidi context.

BUG: 17335734
Change-Id: I5f7cf173ddc30876e2b01320acaff8ba4265edf6
 2014-09-18 16:06:35 +09:00
Tadashi G. Takaoka
e7c2d1c99c am 902cefb6: am 97ad4968: am bfabac44: Suppress voice input key on textWebEmailAddress field 
* commit '902cefb6635053b682a917259eb5a964a17506fd':
  Suppress voice input key on textWebEmailAddress field
 2014-09-18 06:15:41 +00:00
Tadashi G. Takaoka
3e5c442c29 am bfabac44: Suppress voice input key on textWebEmailAddress field 
* commit 'bfabac449d0b529ee22887aa198a34fdf04b3beb':
  Suppress voice input key on textWebEmailAddress field
 2014-09-18 05:58:11 +00:00
Tadashi G. Takaoka
97ad496868 am bfabac44: Suppress voice input key on textWebEmailAddress field 
* commit 'bfabac449d0b529ee22887aa198a34fdf04b3beb':
  Suppress voice input key on textWebEmailAddress field
 2014-09-18 05:53:59 +00:00
Tadashi G. Takaoka
bfabac449d Suppress voice input key on textWebEmailAddress field 
Bug: 17486589
Change-Id: Ie9bf9266ee423b7e03cebcaa5f522accdd1a7802
 2014-09-18 14:08:21 +09:00
Keisuke Kuroyanagi
ace9c14852 Merge "Use PrevWordsInfo.getPrevWordCount() in Java side." 2014-09-18 04:58:44 +00: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
Sandeep Siddhartha
a4e0b6efdd Add Accounts & privacy settings in LatinIME 
Also start showing the logging preference on this screen too.

This settings screen will be the container for all account
management, sync and privacy related settings

Bug: 17464068
Change-Id: Ie0806f6e8a542e9dea2834445ff7b38805207bda
 2014-09-17 20:50:05 -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
Jatin Matani
fc12c0a7fd Merge "Add a user preference for split layout within Appearance & Layouts" 2014-09-17 17:00:38 +00:00
Keisuke Kuroyanagi
4466464c24 Use PrevWordsInfo.getPrevWordCount() in Java side. 
Bug: 14425059
Change-Id: Ie6295ff657c483876af403f2d474b7d857e5e3d6
 2014-09-17 22:04:25 +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
Baligh Uddin
590030f848 Import translations. DO NOT MERGE 
Change-Id: I19678ff53253183c07406b0ece6f169a46f81457
Auto-generated-cl: translation import
 2014-09-17 02:12:04 -07:00
Baligh Uddin
3f50ccf29c Import translations. DO NOT MERGE 
Change-Id: I3dfaab576c0c3aad47e186a2a9d2c5b4a4706594
Auto-generated-cl: translation import
 2014-09-17 02:09:42 -07:00
Baligh Uddin
050237951a Import translations. DO NOT MERGE 
Change-Id: I49fbe075888be15eb2e88516f1ca0407b664d5b8
Auto-generated-cl: translation import
 2014-09-17 02:06:45 -07:00
Baligh Uddin
36125d132f Import translations. DO NOT MERGE 
Change-Id: I5ee3f71942e7ee089d0bdff0264c05956f73a190
Auto-generated-cl: translation import
 2014-09-17 02:01:03 -07:00
Baligh Uddin
1c28a6a2c0 Import translations. DO NOT MERGE 
Change-Id: I2152337de34905215926f0e774d587f8b1bc36b5
Auto-generated-cl: translation import
 2014-09-17 01:59:49 -07:00
Baligh Uddin
196f29339d Import translations. DO NOT MERGE 
Change-Id: Id7ca3e11bc5e49a1d6f32a573c983c7aaf029210
Auto-generated-cl: translation import
 2014-09-17 01:58:26 -07:00
Adrian Velicu
f116f91033 Making spelling of the word "distracters" consistent 
Bug: 17537869
Change-Id: Ibfc1c84aff72aeb76c9b127503369d00f3dfaceb
 2014-09-17 17:32:43 +09:00
Jatin Matani
a5d4cb7769 Add a user preference for split layout within Appearance & Layouts 
Note The preference is flag protected.

Change-Id: I1be219ba961f002897b7b13ff9f200e2f142b2d8
 2014-09-16 23:27:01 -07:00
Tadashi G. Takaoka
44398bb5e1 am cf5fc1ea: am 4e1f1689: am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-dev 
* commit 'cf5fc1ea065873cd6d7b1d5d467940e4e45354d3':
  Fix drawing of custom action label key
 2014-09-16 23:59:08 +00:00
Tadashi G. Takaoka
c5a8bc618a am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-dev 
* commit '5ae057862e316bac7971d2ec325e57d5ff54c592':
  Fix drawing of custom action label key
 2014-09-16 23:31:00 +00:00
Tadashi G. Takaoka
4e1f168967 am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-dev 
* commit '5ae057862e316bac7971d2ec325e57d5ff54c592':
  Fix drawing of custom action label key
 2014-09-16 23:30:17 +00:00
Tadashi G. Takaoka
5ae057862e Merge "Fix drawing of custom action label key" into lmp-dev 2014-09-16 23:22:40 +00:00
Mohammadinamul Sheik
16bfac9ff4 Add StatsUtils.onAutoCorrection method. 
Change-Id: I9547b6c0f082ef7c09b251a6458badb65a841229
 2014-09-16 12:34:22 -07:00
Baligh Uddin
81c1daa9da Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:49:09 +00:00
Baligh Uddin
b979cd5415 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:49:05 +00:00
Baligh Uddin
aaddee7010 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:49:03 +00:00
Baligh Uddin
771a3a7d3a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:49:01 +00:00
Baligh Uddin
d5937725fc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:48:59 +00:00
Baligh Uddin
73cbb9816a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:48:57 +00:00
Ken Wakasa
c0617f3ed5 Merge "Prepare for E MR1 that is linked against L SDK" 2014-09-16 11:54:20 +00: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
Jean Chalard
618907e1f1 Merge "[ML7] Have multiple DictionaryGroup instances in facilitator" 2014-09-16 11:31:27 +00:00
Jean Chalard
8cd5326622 [ML7] Have multiple DictionaryGroup instances in facilitator 
This is the central change of multilingual input.

Bug: 11230254
Change-Id: Id8b68fb101e837e8cf182ab4bc1e55e4da5cc49d
 2014-09-16 19:00:50 +09:00
Tadashi G. Takaoka
dad7a5dffd Fix drawing of custom action label key 
Bug: 17488054
Change-Id: I433561ed19ec2a79402867a0395a3e388730f087
 2014-09-16 18:21:49 +09:00
Sandeep Siddhartha
e143f5b1fe Merge "Initial split QWERTY layout" 2014-09-16 03:06:00 +00:00
Sandeep Siddhartha
23f38149c6 Merge "Add a canSplitKeyboard attribute for specifying split keyboard layouts" 2014-09-16 03:05:46 +00:00
Baligh Uddin
9dafca38d6 Import translations. DO NOT MERGE 
Change-Id: I410c187d99e2896703b7c76079bc1782519d10f0
Auto-generated-cl: translation import
 2014-09-15 00:20:16 -07:00
Baligh Uddin
55cb1e0e4d Import translations. DO NOT MERGE 
Change-Id: Id5c9da5464884357ba3c087c10820b6b84e15ae5
Auto-generated-cl: translation import
 2014-09-15 00:19:02 -07:00
Baligh Uddin
4d56a5fe5f Import translations. DO NOT MERGE 
Change-Id: Id7999e5ed1331e8fc0260c2e529df116bc0661ef
Auto-generated-cl: translation import
 2014-09-15 00:16:06 -07:00
Baligh Uddin
f428a22566 Import translations. DO NOT MERGE 
Change-Id: I2f3eded792bf3882ae4cd16a0a97933f77bc5ce2
Auto-generated-cl: translation import
 2014-09-15 00:15:16 -07:00
Baligh Uddin
accfe85b59 Import translations. DO NOT MERGE 
Change-Id: I0cea5e4fa1120dcce3bf5d5dfd5667167271ef5e
Auto-generated-cl: translation import
 2014-09-15 00:14:38 -07:00
Baligh Uddin
a7e2d9da19 Import translations. DO NOT MERGE 
Change-Id: I9e292160719ac6b4bf617263525d3f00acc9cd87
Auto-generated-cl: translation import
 2014-09-15 00:13:58 -07:00
Baligh Uddin
bf69809aab Import translations. DO NOT MERGE 
Change-Id: I893b13ee353d4ce57b34bf8ca4e0e3a5ddc0b068
Auto-generated-cl: translation import
 2014-09-15 00:12:39 -07:00
Tadashi G. Takaoka
1947a6017c am add81661: am 001df4bf: am 5b9a1e59: Fix key preview popup for Material theme 
* commit 'add816610b0d2978c5bd2653e53444f65d812ecf':
  Fix key preview popup for Material theme
 2014-09-14 10:38:51 +00:00
Tadashi G. Takaoka
001df4bf54 am 5b9a1e59: Fix key preview popup for Material theme 
* commit '5b9a1e59bb7434cce740616c64e274a130a66ee6':
  Fix key preview popup for Material theme
 2014-09-14 10:10:31 +00:00
Tadashi G. Takaoka
1c918c64be am 5b9a1e59: Fix key preview popup for Material theme 
* commit '5b9a1e59bb7434cce740616c64e274a130a66ee6':
  Fix key preview popup for Material theme
 2014-09-14 08:56:38 +00:00
Tadashi G. Takaoka
5b9a1e59bb Fix key preview popup for Material theme 
This CL also removes unused key preview resources for Tablet.

Bug: 15143928
Change-Id: Icbf4f7b6d5c7839b4fe7a27d320a2184f0625130
 2014-09-14 10:48:48 +09:00
Tadashi G. Takaoka
ee3e84e59e am 463c1880: am e458949c: am 941531b2: Merge "Tune keyboard height and letter size of tablet" into lmp-dev 
* commit '463c1880a12708a3013e87ae262ee8e69be15f48':
  Tune keyboard height and letter size of tablet
 2014-09-13 22:47:36 +00:00
Tadashi G. Takaoka
e458949cf8 am 941531b2: Merge "Tune keyboard height and letter size of tablet" into lmp-dev 
* commit '941531b26eb0d95028357ab5615e89227cf84de6':
  Tune keyboard height and letter size of tablet
 2014-09-13 22:16:27 +00:00
Tadashi G. Takaoka
4821af641b am 941531b2: Merge "Tune keyboard height and letter size of tablet" into lmp-dev 
* commit '941531b26eb0d95028357ab5615e89227cf84de6':
  Tune keyboard height and letter size of tablet
 2014-09-13 22:15:44 +00:00
Tadashi G. Takaoka
941531b26e Merge "Tune keyboard height and letter size of tablet" into lmp-dev 2014-09-13 22:00:23 +00:00
Ken Wakasa
1514844b2f am 060f4b94: am bd3a7c4e: am 991571ff: Wording update for settings. 
* commit '060f4b945127f0b4aae2fcbf13a20210290248c4':
  Wording update for settings.
 2014-09-13 12:43:25 +00:00
Tadashi G. Takaoka
ef7124b6fd Tune keyboard height and letter size of tablet 
The height of Google Keyboard is limited by maximum and minimum ratio
to the display height.  Because screen aspect ratio of some large
tablet is close to 1:1, the height of the keyboard may become taller
than expected. This CL lowers the minimum ratio to allow shorter
height. This CL also increase text size of Material theme keyboard on
tablet as well.

Bug: 17050390
Change-Id: I87c5f49ce554950c525a1f31dfddfd1beb3fafda
 2014-09-13 21:12:52 +09:00
Ken Wakasa
73b3d242da am 991571ff: Wording update for settings. 
* commit '991571ff456ebe181489f8dbb737fce941d6a78c':
  Wording update for settings.
 2014-09-13 12:12:16 +00:00
Ken Wakasa
bd3a7c4ecb am 991571ff: Wording update for settings. 
* commit '991571ff456ebe181489f8dbb737fce941d6a78c':
  Wording update for settings.
 2014-09-13 12:12:01 +00:00
Ken Wakasa
991571ff45 Wording update for settings. 
"Appearance" -> "Appearance & layouts".

bug: 11866784
Change-Id: I9843b76cadb0245973cec07134d07212c8c5667e
 2014-09-13 20:02:23 +09:00
Jatin Matani
9b140f4e4f am 4d8efc97: am b41d1fcd: am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev 
* commit '4d8efc97873d12b4596c695fbcf7e72330b5253e':
  Reorganize settings in Google Keyboard
 2014-09-13 02:12:24 +00:00
Ken Wakasa
64176158e7 resolved conflicts for merge of 75513e51 to master 
Change-Id: I058c3e63e5e349b58b2bdd2723cb43fbc24a0425
 2014-09-13 10:41:19 +09:00
Ken Wakasa
8ed81f9fd7 resolved conflicts for merge of 8e9385cc to master 
Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c
 2014-09-13 09:25:23 +09:00
Tadashi G. Takaoka
d190b8c521 am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev 
* commit 'c24340f956c16d8594c44d45685f8a814538245b':
  Update AOSP launcher icon
 2014-09-12 19:16:40 +00:00
Tadashi G. Takaoka
3ecae3d37f am 1073ef97: am 1bb20aa0: am 31544dcb: Add xxxhdpi assets 
* commit '1073ef9756617ecd2b4eeddca045039d9e6f3d14':
  Add xxxhdpi assets
 2014-09-12 19:16:33 +00:00
Jatin Matani
d07f7c5377 am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev 
* commit 'd0d8f90a32b907b867f8fa934dc7582ff53a9a43':
  Reorganize settings in Google Keyboard
 2014-09-12 18:51:23 +00:00
Tadashi G. Takaoka
464840b966 am fd5f2b91: Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev 
* commit 'fd5f2b91fdb67921edf3d9071557d013fa498386':
  Fix not always showing input view with physical keyboard connected
 2014-09-12 18:51:21 +00:00
Jean Chalard
7eade77656 am 7aa47cb3: Only do double-space-period on real text fields. 
* commit '7aa47cb3748d82b6f8bf3713c3c9e05b3fca8979':
  Only do double-space-period on real text fields.
 2014-09-12 18:51:19 +00:00
Jatin Matani
b41d1fcd98 am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev 
* commit 'd0d8f90a32b907b867f8fa934dc7582ff53a9a43':
  Reorganize settings in Google Keyboard
 2014-09-12 18:51:03 +00:00
Tadashi G. Takaoka
ca9c061c41 am fd5f2b91: Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev 
* commit 'fd5f2b91fdb67921edf3d9071557d013fa498386':
  Fix not always showing input view with physical keyboard connected
 2014-09-12 18:51:02 +00:00
Jean Chalard
567c0dd471 am 7aa47cb3: Only do double-space-period on real text fields. 
* commit '7aa47cb3748d82b6f8bf3713c3c9e05b3fca8979':
  Only do double-space-period on real text fields.
 2014-09-12 18:51:00 +00:00
Sandeep Siddhartha
9c31e8f863 Initial split QWERTY layout 
Change [2/3]

Add an attribute that's used in layout xmls for specifying
the split-keyboard layout.
This attribute will be checked/set by the KeyboardBuilder which knows about
the "splittability" of the keyboard.

Bug: 4968173
Change-Id: I5d792e570b9648e09022e9b7e92a972a161009ee
 2014-09-12 18:46:27 +09:00
Sandeep Siddhartha
3939455c1d Add a canSplitKeyboard attribute for specifying split keyboard layouts 
Change [1/3]

This'll be used in conjunction with a user preference to split the keyboard when possible.

Bug: 4968173
Change-Id: I7a05948d67b94a55024790115ae261d7fef7941a
 2014-09-12 18:46:14 +09:00
Jatin Matani
d0d8f90a32 Merge "Reorganize settings in Google Keyboard" into lmp-dev 2014-09-12 09:12:01 +00:00
Tadashi G. Takaoka
fd5f2b91fd Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev 2014-09-12 09:02:31 +00:00
Tadashi G. Takaoka
3a90cb9ad0 Reorganize settings in Google Keyboard 
Changes :
Input languages ->  Languages
Input preferences -> Preferences
Multi lingual Options -> Multilingual Options
Keyboard Theme -> Theme
Gesture typing preferences -> Gesture typing

**New
 Appearance
        -> Theme
        -> Custom input style

**Removed
 Multilingual options from L dynamically

Bug: 11866784
Change-Id: I07404c27868e1b087b0cafb63d2031a5b493a885
 2014-09-12 02:00:26 -07:00
Jean Chalard
7aa47cb374 Only do double-space-period on real text fields. 
Bug: 15559216
Change-Id: Id6ecadc58c03889496967d67371457e4050d695b
 2014-09-12 17:49:47 +09:00
Tadashi G. Takaoka
88f282de0d Fix not always showing input view with physical keyboard connected 
Bug: 17163374
Change-Id: I57f7eeac0c9ac0a15d3d55927e18a2d97849c508
 2014-09-12 17:45:35 +09:00
Yohei Yukawa
97b465044f am ead70974: am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the full-screen mode 
* commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503':
  Support CursorAnchorInfo in the full-screen mode
 2014-09-11 17:31:47 +00:00
Baligh Uddin
64dd48e381 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 17:21:01 +00:00
Baligh Uddin
ee54c35bad Merge "Import translations. DO NOT MERGE" 2014-09-11 17:20:58 +00:00
Tadashi G. Takaoka
ca8935c0e1 am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev 
* commit 'dc1097ee2e85daaed525ceff2154d4d7252c75ed':
  Update AOSP launcher icon
 2014-09-11 16:02:35 +00:00
Tadashi G. Takaoka
f2ddbcc1f9 am 31544dcb: Add xxxhdpi assets 
* commit '31544dcb43bfb4f14339d1c2b3ffa92063487c0c':
  Add xxxhdpi assets
 2014-09-11 16:02:33 +00:00
Yohei Yukawa
ebe6b6009f am cd119050: Support CursorAnchorInfo in the full-screen mode 
* commit 'cd11905022306c9b95f8781f0f8b23a3570f30e9':
  Support CursorAnchorInfo in the full-screen mode
 2014-09-11 16:01:20 +00:00
Tadashi G. Takaoka
74d59ccae1 am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev 
* commit 'dc1097ee2e85daaed525ceff2154d4d7252c75ed':
  Update AOSP launcher icon
 2014-09-11 15:38:55 +00:00
Tadashi G. Takaoka
1bb20aa0cf am 31544dcb: Add xxxhdpi assets 
* commit '31544dcb43bfb4f14339d1c2b3ffa92063487c0c':
  Add xxxhdpi assets
 2014-09-11 15:38:54 +00:00
Tadashi G. Takaoka
dc1097ee2e Merge "Update AOSP launcher icon" into lmp-dev 2014-09-11 15:28:53 +00:00
Tadashi G. Takaoka
ed9e100449 Update AOSP launcher icon 
Bug: 16635354
Bug: 16635354
Change-Id: I68f9c4ec21a01b9db0fc73c1785c972f5d7ac05b
 2014-09-12 00:25:43 +09:00
Tadashi G. Takaoka
31544dcb43 Add xxxhdpi assets 
Bug: 17432407
Change-Id: I68e5f660425db567688d4e119c94fc34430f8ff3
 2014-09-11 15:09:30 +00:00
Jean Chalard
96f0ae5e68 [ML6] Have asyncReloadMainDictionary support multiple locales 
Change-Id: I4c3dfaad38ec1cc91d1a9f81d5ff45ef12f70029
 2014-09-11 19:05:22 +09:00
Jean Chalard
e6df5f015c [ML5] Rewrite resetDictionariesWithDictNamePrefix 
This change rewrites resetDictionariesWithDictNamePrefix so
that it would work if there were several locales, which is going to
happen shortly. This change on its own is quite large and difficult
already, so I didn't want to merge it into the change that actually
makes several locales happen; another such change is following.

Change-Id: Ibb80b05b73c0f0f0bea64b7e308cc4d38ca448f9
 2014-09-11 19:05:19 +09:00
Yohei Yukawa
27ccbeb4e6 am cd119050: Support CursorAnchorInfo in the full-screen mode 
* commit 'cd11905022306c9b95f8781f0f8b23a3570f30e9':
  Support CursorAnchorInfo in the full-screen mode
 2014-09-11 09:54:42 +00:00
Yohei Yukawa
cd11905022 Support CursorAnchorInfo in the full-screen mode 
This CL allows to emulate the behavior of CursorAnchorInfo
in the full-screen mode to work around the limitation of
the framework.

Basically this CL copies relevant code from the framework
to LatinIME. This is actually a code duplicate which isn't
great, but probably the only way that is available right now.

Change-Id: I30bc8c3387c91c8e47252ba699cbd967d8927dad
 2014-09-11 18:36:53 +09:00
Jatin Matani
fd96928175 Merge "Adds StatsUtil methods for LatinIME.on{Start,Create,Finish}inputView" 2014-09-11 03:14:57 +00:00
Keisuke Kuroyanagi
af1a06d7e1 Enable personalization for multilingual users. 
Bug: 16547557
Change-Id: I03eda34edc902fc4732d16d234216344d8d84d88
 2014-09-10 18:23:09 +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
Jatin Matani
1c45f9142b Adds StatsUtil methods for LatinIME.on{Start,Create,Finish}inputView 
Change-Id: I4e7dc008b98e398c38aafea5cb31156dde7f42ea
 2014-09-10 15:55:15 +09:00
Mohammadinamul Sheik
97243cea28 Merge "Add backspace event methods to StatsUtils" 2014-09-10 04:56:23 +00:00
Keisuke Kuroyanagi
934e1d8087 Merge "Move case and OOV detection logic into distracter filter." 2014-09-10 03:49:10 +00: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
Mohammadinamul Sheik
acdd2e4572 Add backspace event methods to StatsUtils 
Change-Id: Id45d217073e49ca5f2ba639b608d168d136bba58
 2014-09-10 10:54:49 +09:00
Tadashi G. Takaoka
63ee10d63a am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action key background 
* commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b':
  Keep aspect ratio of Material action key background
 2014-09-09 15:03:15 +00:00
Baligh Uddin
b575170e64 Import translations. DO NOT MERGE 
Change-Id: Id31c38a0c1c737071e3659fc374eaca40f441102
Auto-generated-cl: translation import
 2014-09-09 04:23:48 -07:00
Baligh Uddin
02729904ab Import translations. DO NOT MERGE 
Change-Id: I760fae2840e78c7dce10f6caf9cae4fffdef71c1
Auto-generated-cl: translation import
 2014-09-09 04:20:58 -07:00
Tadashi G. Takaoka
1b45941588 am 486c4894: Keep aspect ratio of Material action key background 
* commit '486c4894ce0917fc7b18eaee4bfd031051f2b05b':
  Keep aspect ratio of Material action key background
 2014-09-09 06:19:03 +00:00
Tadashi G. Takaoka
12814352dd am 486c4894: Keep aspect ratio of Material action key background 
* commit '486c4894ce0917fc7b18eaee4bfd031051f2b05b':
  Keep aspect ratio of Material action key background
 2014-09-09 06:19:02 +00:00
Tadashi G. Takaoka
486c4894ce Keep aspect ratio of Material action key background 
Bug: 15681452
Change-Id: Ie4b823dca541b76b68cade580845a21ff0b21e2f
 2014-09-09 14:28:46 +09:00
Jean Chalard
ef0ef2d0b9 am beb74610: am ab18b5f1: am 9395014e: Don\'t resume suggestions with H/W keyboard 
* commit 'beb746103011149d6dfce10278475946e679263d':
  Don't resume suggestions with H/W keyboard
 2014-09-08 13:52:25 +00:00
Jean Chalard
7140035932 Fix a missing initialization 
Change-Id: I14a35f5a38b6e0f48c95cbb8c0c6e4507cd61fa7
 2014-09-08 22:40:36 +09:00
Jean Chalard
ab18b5f1f7 am 9395014e: Don\'t resume suggestions with H/W keyboard 
* commit '9395014e76877fc9ef060a3fe54a9e06f0036d6d':
  Don't resume suggestions with H/W keyboard
 2014-09-08 13:29:55 +00:00
Jean Chalard
5e3b3ab809 am 9395014e: Don\'t resume suggestions with H/W keyboard 
* commit '9395014e76877fc9ef060a3fe54a9e06f0036d6d':
  Don't resume suggestions with H/W keyboard
 2014-09-08 13:29:47 +00: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
9395014e76 Don't resume suggestions with H/W keyboard 
...unless we do support a hardware keyboard, which we still
do not at the moment.

Change-Id: Iec24b1ae8ba5e23e0bbb7e5a468b7404296d4b18
 2014-09-08 22:14:02 +09:00
Jean Chalard
0eaa25e0b3 am 914078fd: Fix a bug where recorrection would stop on connectors 
* commit '914078fd9198aeb3d7ffa034562321d688d588f7':
  Fix a bug where recorrection would stop on connectors
 2014-09-08 12:59:23 +00:00
Jean Chalard
1708ff6e54 am 914078fd: Fix a bug where recorrection would stop on connectors 
* commit '914078fd9198aeb3d7ffa034562321d688d588f7':
  Fix a bug where recorrection would stop on connectors
 2014-09-08 12:58:51 +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
Tadashi G. Takaoka
c106efa7cd am 50e8d585: am 56c7ceb4: am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev 
* commit '50e8d5854b981b7fbad24fdb9c141ddf39eb904a':
  Mark isDefault="true" for all supported subtypes
 2014-09-08 10:25:14 +00:00
Tadashi G. Takaoka
56c7ceb47d am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev 
* commit '42665f0ee26407fae984446b306309376aac2b36':
  Mark isDefault="true" for all supported subtypes
 2014-09-08 10:05:34 +00:00
Tadashi G. Takaoka
b28b83cc4c am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev 
* commit '42665f0ee26407fae984446b306309376aac2b36':
  Mark isDefault="true" for all supported subtypes
 2014-09-08 10:04:43 +00:00
Tadashi G. Takaoka
42665f0ee2 Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev 2014-09-08 09:56:25 +00:00
Yohei Yukawa
a48fe12b9c am 42ddc212: am f930ce12: am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev 
* commit '42ddc2127deb117a0bb2b7a7797cb8c9ba335f5a':
  Follow up API signature changes of CursorAnchorInfo
 2014-09-08 09:35:00 +00:00
Jean Chalard
653546a618 am c3fac52d: am 1f74ba17: am cb077f75: Merge "Resolve an old TODO." into lmp-dev 
* commit 'c3fac52dd51ba70db83d96b2d421bd440683d9bc':
  Resolve an old TODO.
 2014-09-08 09:34:58 +00:00
Yohei Yukawa
f930ce1261 am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev 
* commit '1caa0b714dc49c8723d36d4d9825427f8978a602':
  Follow up API signature changes of CursorAnchorInfo
 2014-09-08 09:18:14 +00:00
Jean Chalard
1f74ba178b am cb077f75: Merge "Resolve an old TODO." into lmp-dev 
* commit 'cb077f75ac750d50c305ac5da20d81df5003907a':
  Resolve an old TODO.
 2014-09-08 09:18:13 +00:00
Yohei Yukawa
b9bd524b58 am c1ee8857: am a6c53d31: am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev 
* commit 'c1ee88572232235d5972220ec1e5232de58a916e':
  Revert "Use right arrow for the commit indicator"
 2014-09-08 09:17:31 +00:00
Yohei Yukawa
b0c7f31333 am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev 
* commit '1caa0b714dc49c8723d36d4d9825427f8978a602':
  Follow up API signature changes of CursorAnchorInfo
 2014-09-08 09:14:59 +00:00
Jean Chalard
7737c9d712 am cb077f75: Merge "Resolve an old TODO." into lmp-dev 
* commit 'cb077f75ac750d50c305ac5da20d81df5003907a':
  Resolve an old TODO.
 2014-09-08 09:14:58 +00:00
Tadashi G. Takaoka
5314e5c38c Mark isDefault="true" for all supported subtypes 
Bug: 17381393
Change-Id: I3a2852c76d6f3dda551529673e7d4e957ced53ca
 2014-09-08 18:14:51 +09:00
Yohei Yukawa
1caa0b714d Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev 2014-09-08 09:11:41 +00:00
Jean Chalard
a1d2315499 Merge "Fix a bug with the Greek question mark." 2014-09-08 08:58:27 +00:00
Jean Chalard
cb077f75ac Merge "Resolve an old TODO." into lmp-dev 2014-09-08 08:57:23 +00:00
Yohei Yukawa
a8ecd29646 Follow up API signature changes of CursorAnchorInfo 
This is a follow up CL for Ic8c6fab58c01206872a34e7ee604cdda.

No behavior change is intended in this CL.

BUG: 17365414
BUG: 17335734
Change-Id: I4299536d0cb0c660b7b564653c72c9cb409a7aa5
 2014-09-08 17:07:34 +09:00
Yohei Yukawa
a6c53d31fd am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev 
* commit '257dfa79f7f19eac5f3481f1b8fe28038d1e0c5e':
  Revert "Use right arrow for the commit indicator"
 2014-09-08 07:58:01 +00:00
Yohei Yukawa
97dbb22e86 am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev 
* commit '257dfa79f7f19eac5f3481f1b8fe28038d1e0c5e':
  Revert "Use right arrow for the commit indicator"
 2014-09-08 07:56:16 +00:00
Yohei Yukawa
257dfa79f7 Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev 2014-09-08 07:49:22 +00:00
Yohei Yukawa
b915753a07 Revert "Use right arrow for the commit indicator" 
This reverts commit 2412d9ae3c.

Change-Id: Ie8090735850e2f2d075d0bdaf3ef628d866b5514
 2014-09-08 07:46:11 +00:00
Mohammadinamul Sheik
74332597d6 Merge "Add StatsUtils.onPickSuggestionManually and SuggestedWords.indexOf." 2014-09-08 06:52:02 +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
100a8aec5b am ad4de3fc: am 9ca6658e: am 0f33e614: Implement Floating Action Button more keys keyboard 
* commit 'ad4de3fc819d658775eed470fc74ad76da5caad2':
  Implement Floating Action Button more keys keyboard
 2014-09-08 06:07:52 +00:00
Tadashi G. Takaoka
9ca6658e9a am 0f33e614: Implement Floating Action Button more keys keyboard 
* commit '0f33e614c0799fa3a14a2c32db4bf0654df039da':
  Implement Floating Action Button more keys keyboard
 2014-09-08 05:48:19 +00:00
Tadashi G. Takaoka
40b0e3a4c8 am 0f33e614: Implement Floating Action Button more keys keyboard 
* commit '0f33e614c0799fa3a14a2c32db4bf0654df039da':
  Implement Floating Action Button more keys keyboard
 2014-09-08 05:47:40 +00:00
Tadashi G. Takaoka
e1b10aedd7 am 3aabf655: am f21c77d7: am 727e818e: Move more keys divider to MoreKeysKeyboardView 
* commit '3aabf655d0125fb824e5e47687f5084b2df6979c':
  Move more keys divider to MoreKeysKeyboardView
 2014-09-08 05:42:32 +00:00
Tadashi G. Takaoka
0f33e614c0 Implement Floating Action Button more keys keyboard 
Bug: 15681452
Change-Id: I8484e4fe4d989b391f2b5230836dc9dfac218429
 2014-09-08 14:34:33 +09:00
Tadashi G. Takaoka
f21c77d7b7 am 727e818e: Move more keys divider to MoreKeysKeyboardView 
* commit '727e818e95ef68460ebafb2eb3b11c23a2d8fcd8':
  Move more keys divider to MoreKeysKeyboardView
 2014-09-08 05:24:19 +00:00
Tadashi G. Takaoka
0ee849d716 am 727e818e: Move more keys divider to MoreKeysKeyboardView 
* commit '727e818e95ef68460ebafb2eb3b11c23a2d8fcd8':
  Move more keys divider to MoreKeysKeyboardView
 2014-09-08 05:23:11 +00:00
Mohammadinamul Sheik
c74ffe8edc Add StatsUtils.onPickSuggestionManually and SuggestedWords.indexOf. 
Change-Id: I1588448154d086569cb026825fdc36cd1812a582
 2014-09-07 20:43:48 -07:00
Tadashi G. Takaoka
727e818e95 Move more keys divider to MoreKeysKeyboardView 
Bug: 15681452
Change-Id: I1b32719cc927a24db4c41fdeb812b39f7e98a85c
 2014-09-08 11:02:07 +09:00
Tadashi G. Takaoka
8b7ed7f6c6 am 079f9c3f: am 1b430219: am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev 
* commit '079f9c3f5ae7b2f7926321522b6020affd422b52':
  Create donottranslate debug settings string resources file
 2014-09-05 17:23:45 +00: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
Tadashi G. Takaoka
1b43021949 am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev 
* commit '6888ec009951ffd900c04a0ad179a94d47eca03c':
  Create donottranslate debug settings string resources file
 2014-09-05 15:37:02 +00:00
Tadashi G. Takaoka
c7b8858ec1 am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev 
* commit '6ba84dcd96418a7a568afeaf064aa64cf94a1839':
  Refactor action label/icon definitions
 2014-09-05 15:37:01 +00:00
Tadashi G. Takaoka
1a6651f636 am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev 
* commit '6888ec009951ffd900c04a0ad179a94d47eca03c':
  Create donottranslate debug settings string resources file
 2014-09-05 15:36:06 +00:00
Tadashi G. Takaoka
7f8501867e am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev 
* commit '6ba84dcd96418a7a568afeaf064aa64cf94a1839':
  Refactor action label/icon definitions
 2014-09-05 15:36:05 +00:00
Jean Chalard
6bb6d30344 Resolve an old TODO. 
This is cleaner.

Bug: 17347779
Change-Id: I5b612783b1ec98a1a11401f00d68db49654f3023
 2014-09-05 20:10:29 +09:00
Jean Chalard
46d111ff4a Merge "Fix a bug where CAPS_WORDS would not be returned." 2014-09-05 09:53:51 +00:00
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
6aad318bd2 am 79eae0ad: Merge "Update active key backgrounds" into lmp-dev 
* commit '79eae0ada40d7af096ad95e03ab1f32c8369cb2c':
  Update active key backgrounds
 2014-09-05 00:13:51 +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