Satoshi Kataoka
776e81be37
am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity"
...
* commit '7b4703402e2cc999a20fc3f40eb165a0c6cc2da9':
Fix the security related API change for PreferenceActivity
2013-12-12 17:51:09 -08:00
Jean Chalard
e027ac9f7f
am a8285a24: am dfaec345: Merge "Always call finishComposingText before recapitalization"
...
* commit 'a8285a2425865ec617ae6c3d0fd22208ffc5ef17':
Always call finishComposingText before recapitalization
2013-12-12 17:51:05 -08:00
Jean Chalard
416b5e83a5
am bfa0d8df: am e306d292: Merge "Remove a useless IPC call."
...
* commit 'bfa0d8df8d307a0348bb85b682167bce9077862e':
Remove a useless IPC call.
2013-12-12 17:51:01 -08:00
Satoshi Kataoka
faf999f8de
am a87070b6: am 50f9ca4a: Fix crash in AdditionalSubtypeUtils
...
* commit 'a87070b6c5cfaffa5b2ff58103e5ae2267292d83':
Fix crash in AdditionalSubtypeUtils
2013-12-12 17:50:57 -08:00
Baligh Uddin
5c47cee083
am 6a8a163d: (-s ours) am d823988b: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '6a8a163d88d5bf53216035ce30f63f5b6aff442b':
Import translations. DO NOT MERGE
2013-12-12 17:50:55 -08:00
Baligh Uddin
7139cc38af
am 549559e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '549559e28d82936e023272683601e2da8247c357':
Import translations. DO NOT MERGE
2013-12-12 17:50:50 -08:00
Baligh Uddin
0ff053b816
am 29aa336a: (-s ours) am 56a57a72: (-s ours) am feb38ca5: (-s ours) am 2c1e965b: (-s ours) am e8bbcb1d: (-s ours) am 96c86af0: (-s ours) Import translations. DO NOT MERGE
...
* commit '29aa336a41dad18a145c398b46f540b0e6917755':
Import translations. DO NOT MERGE
2013-12-12 09:00:47 -08:00
Baligh Uddin
29aa336a41
am 56a57a72: (-s ours) am feb38ca5: (-s ours) am 2c1e965b: (-s ours) am e8bbcb1d: (-s ours) am 96c86af0: (-s ours) Import translations. DO NOT MERGE
...
* commit '56a57a7243ea890d9cec28d5d2a71ad05d608566':
Import translations. DO NOT MERGE
2013-12-12 16:57:50 +00:00
Baligh Uddin
56a57a7243
am feb38ca5: (-s ours) am 2c1e965b: (-s ours) am e8bbcb1d: (-s ours) am 96c86af0: (-s ours) Import translations. DO NOT MERGE
...
* commit 'feb38ca514063a9dd76abf32b024557671cdf86b':
Import translations. DO NOT MERGE
2013-12-12 16:51:28 +00:00
Baligh Uddin
feb38ca514
am 2c1e965b: (-s ours) am e8bbcb1d: (-s ours) am 96c86af0: (-s ours) Import translations. DO NOT MERGE
...
* commit '2c1e965b213f2dd7c8e8289616faf72bf10cf306':
Import translations. DO NOT MERGE
2013-12-12 16:48:01 +00:00
Baligh Uddin
2c1e965b21
am e8bbcb1d: (-s ours) am 96c86af0: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e8bbcb1d7426968fd3f5a6ac72f7d548a463a813':
Import translations. DO NOT MERGE
2013-12-12 08:44:29 -08:00
Baligh Uddin
e8bbcb1d74
am 96c86af0: (-s ours) Import translations. DO NOT MERGE
...
* commit '96c86af0b5d79cc3ebaf139b7877377c3dca32dd':
Import translations. DO NOT MERGE
2013-12-12 08:40:31 -08:00
Keisuke Kuroyanagi
3275ee27c9
am b50eb84e: Merge "Add a constructor for testing to non-main dictionaries."
...
* commit 'b50eb84ecd6f74cc8e3176a5729f59846c75773a':
Add a constructor for testing to non-main dictionaries.
2013-12-12 04:58:33 -08:00
Keisuke Kuroyanagi
b50eb84ecd
Merge "Add a constructor for testing to non-main dictionaries."
2013-12-12 12:54:34 +00:00
Baligh Uddin
96c86af0b5
Import translations. DO NOT MERGE
...
Change-Id: Ib2de3eec303a80b4cae3599c61740db23370dd03
Auto-generated-cl: translation import
2013-12-12 04:40:19 -08:00
Keisuke Kuroyanagi
9bd6dac470
Add a constructor for testing to non-main dictionaries.
...
The new constructor is used for creating dictionary instance
that uses a given file.
Bug: 11956652
Change-Id: Ifbf420a1a768eb95a5c3a58eeb1be5936b306d35
2013-12-12 20:14:06 +09:00
Tadashi G. Takaoka
6799ae3626
am 091739a8: Merge "Separate form factor dependent config resources"
...
* commit '091739a83540723940980eef17ca25e548205500':
Separate form factor dependent config resources
2013-12-12 01:41:41 -08:00
Tadashi G. Takaoka
091739a835
Merge "Separate form factor dependent config resources"
2013-12-12 09:26:48 +00:00
Tadashi G. Takaoka
73768e40e6
Separate form factor dependent config resources
...
Change-Id: I668b55a51414a3e69d4e2197d7ffeecbd4f18819
2013-12-12 18:22:04 +09:00
Keisuke Kuroyanagi
5a190037e4
am 5f304d0d: Merge "Add waitAllTasksForTests for testing."
...
* commit '5f304d0d71b422d1fd4edc41c71e99181b6e8174':
Add waitAllTasksForTests for testing.
2013-12-12 00:18:28 -08:00
Keisuke Kuroyanagi
5f304d0d71
Merge "Add waitAllTasksForTests for testing."
2013-12-12 08:15:44 +00:00
Keisuke Kuroyanagi
d06de553b2
Add waitAllTasksForTests for testing.
...
Bug: 10667710
Change-Id: I7a189e32286a6005393fbde8da736541ca9226a8
2013-12-12 17:08:51 +09:00
Jean Chalard
589cbdf13d
am 75de9fb7: Remove flags from Java side.
...
* commit '75de9fb7ff5662360be6076622bcdac25d01f90b':
Remove flags from Java side.
2013-12-12 00:05:26 -08:00
Keisuke Kuroyanagi
c01ade214d
am 9ff51527: Quit passing header file path to native.
...
* commit '9ff51527a398a6db15d67e9a592785fd3bce542b':
Quit passing header file path to native.
2013-12-12 00:01:57 -08:00
Jean Chalard
75de9fb7ff
Remove flags from Java side.
...
This simplifies the code quite a bit.
- GERMAN_UMLAUTS are now handled through a key-value attribute.
The dictionary generator does not need to know about it any more.
- FRENCH_LIGATURES are deprecated as we handle them with shortcuts now.
- CONTAINS_BIGRAMS is deprecated. Bigram processing is always applied
regardless of this flag.
Bug: 11281748
Change-Id: I55a11ba61d3589c1584a3fa6c941374b349b7b5c
2013-12-12 17:01:29 +09:00
Keisuke Kuroyanagi
9ff51527a3
Quit passing header file path to native.
...
Bug: 12089197
Change-Id: Ia898f8d2836c0c131a1834dc0a396d9121ecb972
2013-12-12 16:48:34 +09:00
Keisuke Kuroyanagi
69b849f05e
am 4e9d1154: Merge "Remove or rename native codes for ver3 dictionary format."
...
* commit '4e9d115401ce4deec7308849d63e0e64a3ed24cd':
Remove or rename native codes for ver3 dictionary format.
2013-12-11 22:33:20 -08:00
Keisuke Kuroyanagi
4e9d115401
Merge "Remove or rename native codes for ver3 dictionary format."
2013-12-12 06:31:59 +00:00
Keisuke Kuroyanagi
90cff563a0
Remove or rename native codes for ver3 dictionary format.
...
Change-Id: I2d1fe515fc8bbbc7095581fccb4af94377ec11b2
2013-12-12 14:53:11 +09:00
Jean Chalard
96401923d1
am 9fa221a7: Remove dependency from StringUtils to Json
...
* commit '9fa221a7bd5460752286dc4ac592a84f66513baa':
Remove dependency from StringUtils to Json
2013-12-11 21:42:59 -08:00
Jean Chalard
9fa221a7bd
Remove dependency from StringUtils to Json
...
Change-Id: I2a89497fb9ec12a37ba09f4598742e88f6700576
2013-12-12 13:55:56 +09:00
Tadashi G. Takaoka
c52adddd37
am 79cc690f: Fix Filipino keyboard
...
* commit '79cc690f5569b2151cccc2bb5ee740a0bae56599':
Fix Filipino keyboard
2013-12-11 18:18:38 -08:00
Tadashi G. Takaoka
79cc690f55
Fix Filipino keyboard
...
Bug: 12102802
Change-Id: Id55ba5ebd8ddaf83ed246315d81b25ad4c9b6294
2013-12-12 11:12:23 +09:00
Keisuke Kuroyanagi
ff6359e111
am 549ae3d8: Merge "Create ver4 dictionary files with the dictionary name."
...
* commit '549ae3d84effba95d2f37737bfa3ccb1d87094c7':
Create ver4 dictionary files with the dictionary name.
2013-12-11 02:43:45 -08:00
Keisuke Kuroyanagi
549ae3d84e
Merge "Create ver4 dictionary files with the dictionary name."
2013-12-11 10:42:16 +00:00
Keisuke Kuroyanagi
84cc5a2c76
Create ver4 dictionary files with the dictionary name.
...
Bug: 12025402
Change-Id: Ia0bb13b2e26aa60a67dff73f3f6a1e276f1bb1dd
2013-12-11 19:30:18 +09:00
Tadashi G. Takaoka
176dd05934
am 0719c4ca: Merge "Ignore other finger while showing more keys keyboard"
...
* commit '0719c4ca7283946c99b9291a7ba31c41fd3ff391':
Ignore other finger while showing more keys keyboard
2013-12-11 01:44:05 -08:00
Tadashi G. Takaoka
0719c4ca72
Merge "Ignore other finger while showing more keys keyboard"
2013-12-11 09:20:02 +00:00
Tadashi G. Takaoka
7f82bb55ed
Ignore other finger while showing more keys keyboard
...
Bug: 12088861
Change-Id: I784cb8fee247a7a4ea4af4c0569fed9334430e18
2013-12-11 18:12:45 +09:00
Keisuke Kuroyanagi
777ea9a2dd
am 54653533: Merge "Fix offdevice build."
...
* commit '54653533d2072b7d0983a6fb1635b06c140d98b1':
Fix offdevice build.
2013-12-11 00:22:09 -08:00
Keisuke Kuroyanagi
54653533d2
Merge "Fix offdevice build."
2013-12-11 08:19:22 +00:00
Tadashi G. Takaoka
338fe17c45
am 7ca3dbe3: Merge "Don\'t start long press timer while other one is running"
...
* commit '7ca3dbe3e51d7312f17f97795794154920e719de':
Don't start long press timer while other one is running
2013-12-11 00:11:10 -08:00
Tadashi G. Takaoka
7ca3dbe3e5
Merge "Don't start long press timer while other one is running"
2013-12-11 08:07:47 +00:00
Keisuke Kuroyanagi
4fbf4f8340
Fix offdevice build.
...
Change-Id: I6e1032ae5f899732fc5121d14d2d2f2b0fb6f759
2013-12-11 17:06:46 +09:00
Tadashi G. Takaoka
fa860a091e
Don't start long press timer while other one is running
...
Bug: 11908158
Bug: 12088861
Change-Id: I2537855f505884da9fe958d946c79840bd19dc5f
2013-12-11 17:01:26 +09:00
Jean Chalard
37f5de28d2
am 502f3aca: Merge "Read options from attributes"
...
* commit '502f3aca01f79f88e30a451e088689d44ffe5e35':
Read options from attributes
2013-12-10 23:41:05 -08:00
Jean Chalard
502f3aca01
Merge "Read options from attributes"
2013-12-11 07:39:00 +00:00
Jean Chalard
f2e703eb95
Read options from attributes
...
This reads the German umlaut option from the key-attribute
store, and removes all native references to the flag.
This also completely removes the French ligatures option which
has been unused for some time.
Bug: 11281748
Change-Id: I407c02640ad0f2e01585db9087633c01507b5f3f
2013-12-11 15:43:47 +09:00
Tadashi G. Takaoka
8d9ae1c41f
am 0a190a38: Merge "Rename deprecated locale directories"
...
* commit '0a190a389f044143262b07b9a6b4422b2d462d1b':
Rename deprecated locale directories
2013-12-10 22:03:58 -08:00
Tadashi G. Takaoka
0a190a389f
Merge "Rename deprecated locale directories"
2013-12-11 06:01:34 +00:00