Jean Chalard
040502f007
am 716c7d29: am 30424521: Merge "[HW7] Introduce consumed events" into lmp-dev
...
* commit '716c7d2923b0bd455dd9e0464c0dbf289ba76965':
2015-03-20 23:20:34 +00:00
Keisuke Kuroyanagi
d830dedf50
am db72a4f6: am 6c3b0d3c: Merge "Add TrieMap." into lmp-dev
...
* commit 'db72a4f6862fbbd0bc0c9a2d165329b804baacf4':
2015-03-20 23:20:32 +00:00
Tadashi G. Takaoka
acf93f1944
am 8172a681: am a715d7f6: Use fragment for keyboard theme settings
...
* commit '8172a681439501a755459ca755c1a877fec919d6':
2015-03-20 23:20:30 +00:00
Jean Chalard
3437ce732c
am 4591869d: am 6c39db9f: Merge "[HW6] Split processing and applying the event." into lmp-dev
...
* commit '4591869d562baef393b6ff63e90378401183dbc7':
2015-03-20 23:20:26 +00:00
Keisuke Kuroyanagi
9eef3d81f2
am 803a8241: am 2e32e83b: Merge "Get n-gram probability in structure policy." into lmp-dev
...
* commit '803a8241c14cea39c6fee49bc6be80797442e6f9':
2015-03-20 23:20:22 +00:00
Keisuke Kuroyanagi
ea464e3e5c
am d4331c92: am 179f38cc: Merge "Change getUnigramProbabilityOfPtNode to getProbabilityOfPtNode()" into lmp-dev
...
* commit 'd4331c9294dae1f9769a97625a8a25bcd329b98a':
2015-03-20 23:20:19 +00:00
Jean Chalard
8a74bbdbf5
am 1e2fb096: am 76ad2597: Merge "Improve the russian dictionary." into lmp-dev
...
* commit '1e2fb096143acc964ee9635c0448964b13a30c3a':
2015-03-20 23:20:14 +00:00
Tadashi G. Takaoka
f7c22c5a95
am eee0baad: am 76cffec7: Show "navigate up" icon on settings activity
...
* commit 'eee0baad2e7ac239cda55e675faaebd9642c21d3':
2015-03-20 23:20:11 +00:00
Tadashi G. Takaoka
fc649a5ae9
am af6cfb36: am 8ca3eb67: Merge "Update Material icons and backgrounds" into lmp-dev
...
* commit 'af6cfb36cf15883022a527a3d47f53c18c259041':
2015-03-20 23:20:08 +00:00
Keisuke Kuroyanagi
f885dd08b3
am 5e6431ce: am c6862ee6: Merge "Allow adding DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev
...
* commit '5e6431ce32e27d2cdc9e05ea24a7005a3c541386':
2015-03-20 23:20:05 +00:00
Keisuke Kuroyanagi
728ca72875
am 7d48233e: am 6850ea0e: Merge "Add boundary check for ver2 bigram reading." into lmp-dev
...
* commit '7d48233e72296bd7d7567f4e8ee90cb55d812371':
2015-03-20 23:20:03 +00:00
Jean Chalard
ff44957a0f
am b6a75d10: am 036b83f4: Merge "Wait for an event before actually realizing it" into lmp-dev
...
* commit 'b6a75d10de3ab43dcf318fde77e81918fc55e02b':
2015-03-20 23:20:01 +00:00
Tadashi G. Takaoka
21fcf1e44b
am 5fc43eb0: am 1e491d90: Merge "Use fragment for advanced preference screen" into lmp-dev
...
* commit '5fc43eb04df9870fb6256d8d3918e7d399ca8a79':
2015-03-20 23:19:59 +00:00
Keisuke Kuroyanagi
c6e3327f88
am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
...
* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':
2015-03-20 23:19:57 +00:00
Tadashi G. Takaoka
45125cdb25
am 1f5881b7: am 9ba85413: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
...
* commit '1f5881b752b9b8e527b00e14150cfedd916513ce':
2015-03-20 23:19:55 +00:00
Tadashi G. Takaoka
b333044e8c
am b1067103: am 633f1a5e: Merge "Use fragment for text correction preference screen" into lmp-dev
...
* commit 'b1067103343c9b196e0a9276f3e9f7c20b6def86':
2015-03-20 23:19:53 +00:00
Tadashi G. Takaoka
6be2c53343
am f63a044c: am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
...
* commit 'f63a044c6649f3cabc3b612ed5bd79b6601f52ae':
2015-03-20 23:19:49 +00:00
Tadashi G. Takaoka
79dae72f64
am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit 'beffde59c36515f77946b35c2b0279413a1df69f':
2015-03-20 23:19:47 +00:00
Jean Chalard
e1d235cee8
am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit 'ac82983f65626c1db3fd878ba059807166ffbe36':
2015-03-20 23:19:45 +00:00
Tadashi G. Takaoka
1e1805f5fe
am c140938d: am bfcd98ed: Use fragment for input preference screen
...
* commit 'c140938d99b2b34e95d7e45425396f280a486043':
2015-03-20 23:19:43 +00:00
Tadashi G. Takaoka
4432dd0bf9
am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit '26a2986581410536a98e1c311214dc90d9934546':
2015-03-20 23:19:41 +00:00
Keisuke Kuroyanagi
efeb96922a
am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '370ffb424f4d03143c7e5d8186206e58e6fb4021':
2015-03-20 23:19:40 +00:00
Keisuke Kuroyanagi
1d60823c08
am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit '90ac50ee433d7ecb1a89da242d0d99b882169d17':
2015-03-20 23:19:38 +00:00
Keisuke Kuroyanagi
17e21da36e
am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit '16665da28091f977e92dd0382eb3adefc8478f36':
2015-03-20 23:19:36 +00:00
Tim Murray
052556d16b
am da9cc773: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
Use default compiler flags for dicttool.
2015-03-20 23:19:19 +00:00
Geoff Mendal
c84e354cfd
am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'ca58fb9c0bbe31f8d626c0c2dab39569b6a03d5a':
Import translations. DO NOT MERGE
2015-01-29 01:11:45 +00:00
Geoff Mendal
01c2e28b66
am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '9206174e6ba94bb2b11871c983c74989684ecf4f':
Import translations. DO NOT MERGE
2015-01-29 01:11:43 +00:00
Geoff Mendal
55e201fa7c
am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a9431f676d472cb6b103f9d99e9c64de7d161f57':
Import translations. DO NOT MERGE
2015-01-29 01:11:41 +00:00
Geoff Mendal
813f6d801f
am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a2fd9c6cdd094e6a076949129c01ca6d10d6fa24':
Import translations. DO NOT MERGE
2015-01-29 01:11:39 +00:00
Geoff Mendal
97c66ce52d
am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '5bc30df7e03f9354a03d9a5f7819cd3bdae18201':
Import translations. DO NOT MERGE
2015-01-29 01:11:38 +00:00
Geoff Mendal
72e69bd96c
am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'cad0777a4bade34d6bedd096eae712e29df99fc1':
Import translations. DO NOT MERGE
2015-01-29 01:11:37 +00:00
Geoff Mendal
7b5472bfab
am 31d085ff: (-s ours) Import translations. DO NOT MERGE
...
* commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc':
Import translations. DO NOT MERGE
2015-01-29 01:11:35 +00:00
Geoff Mendal
ca58fb9c0b
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2015-01-29 01:06:18 +00:00
Geoff Mendal
9206174e6b
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2015-01-29 01:05:55 +00:00
Geoff Mendal
a9431f676d
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2015-01-29 01:05:39 +00:00
Geoff Mendal
a2fd9c6cdd
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2015-01-29 01:05:18 +00:00
Geoff Mendal
5bc30df7e0
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2015-01-29 01:04:57 +00:00
Geoff Mendal
cad0777a4b
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2015-01-29 01:04:16 +00:00
Geoff Mendal
994944adda
Import translations. DO NOT MERGE
...
Change-Id: Id4c91d74424104f77e25d07e8852339caa6a0f97
Auto-generated-cl: translation import
2015-01-28 17:03:49 -08:00
Geoff Mendal
ed42727493
Import translations. DO NOT MERGE
...
Change-Id: I678822c97755e3f9bf00aa0d6622b082bee74335
Auto-generated-cl: translation import
2015-01-28 17:02:42 -08:00
Geoff Mendal
79f4572a31
Import translations. DO NOT MERGE
...
Change-Id: I40995ffa826f56b4bb210d274395b67c80c0db7e
Auto-generated-cl: translation import
2015-01-28 17:01:59 -08:00
Geoff Mendal
8d0b0e67d2
Import translations. DO NOT MERGE
...
Change-Id: I03f9178e637255e5e3bd3f6ca75b922c49bb0ce1
Auto-generated-cl: translation import
2015-01-28 17:01:14 -08:00
Geoff Mendal
b150f5e3fa
Import translations. DO NOT MERGE
...
Change-Id: I2e23417560e24487e2421c632b956acecb78685a
Auto-generated-cl: translation import
2015-01-28 17:00:42 -08:00
Geoff Mendal
38b2ac82fc
Import translations. DO NOT MERGE
...
Change-Id: Ib3c761dfca6acc7b2ca23838e777ed702f49f7e8
Auto-generated-cl: translation import
2015-01-28 17:00:08 -08:00
Geoff Mendal
31d085ffca
Import translations. DO NOT MERGE
...
Change-Id: Ib4a377f96214ed7292cb0ff3e2815f1c864cc1bb
Auto-generated-cl: translation import
2015-01-28 16:59:02 -08:00
Tadashi G. Takaoka
b348d9cc57
am 943db315: (DO NOT MERGE) Fix Greek accented upper case letters
...
* commit '943db315f55db7ef86dc0f78b6354238422039d8':
(DO NOT MERGE) Fix Greek accented upper case letters
2014-11-21 17:04:06 +00:00
Tadashi G. Takaoka
943db315f5
(DO NOT MERGE) Fix Greek accented upper case letters
...
Cherry-picked 6fc92899d82f4d3cb30f7bb2c57133154f0babd2 from
ub-latinimegoogle-edamame-mr1-release.
Bug: 18418991
Change-Id: Id4dff41ba488635ff9af899be6d4f84ab00a96c8
2014-11-21 15:14:46 +09:00
Sandeep Siddhartha
d4662983d8
Fix restore from keyboard
...
automerge: e551539
* commit 'e5515395f11ce3f6ba5ddebb1fc029c51f51b8b3':
Fix restore from keyboard
2014-11-07 18:43:17 +00:00
Sandeep Siddhartha
e5515395f1
Fix restore from keyboard
...
The keyboard starts up before the restore process and the default shared
preferences are cached and used even after the restore.
Bug: 17837918
Change-Id: I2669e377b6e95813657fd6a80fbff4472330e3aa
(cherry picked from commit e9d814674b
)
2014-11-07 02:54:14 +00:00
Baligh Uddin
2ffe6a2340
am d25f8443: (-s ours) am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'd25f8443ebf3ec5adb28ae6e24c3d17f6a0bdf7b':
Import translations. DO NOT MERGE
2014-10-19 22:37:20 +00:00