Ken Wakasa
0594dfe20d
am ec8472b5: am 7f545a57: [HW7.5] Introduce the @Nonnull annotation (take 2)
...
* commit 'ec8472b5f5e478ba4eb830a7603da9c5a4637461':
2015-03-20 23:21:09 +00:00
Jean Chalard
55a6c4e0e4
am 14d985bd: am 0f6807bf: Merge "[HW7] Introduce consumed events" into lmp-dev
...
* commit '14d985bdbdfd4a237add1009912a6920573c1a9d':
2015-03-20 23:21:07 +00:00
Jean Chalard
e18dcf5649
am 99e13e48: am bf2a3210: Merge "[HW6] Split processing and applying the event." into lmp-dev
...
* commit '99e13e485a314615a6523794fbb26eecb6e67a74':
2015-03-20 23:21:05 +00:00
Ken Wakasa
ae38277365
am e6a9f797: am 0b1fa0c1: Cleanup: C++11 doesn\'t require a space between angle brackets
...
* commit 'e6a9f7974721b0ec7fa5bf41fb1eafff4f41f9d0':
2015-03-20 23:21:04 +00:00
Ken Wakasa
5d211a8250
am 93114fa0: am c4f6fc1e: Merge "Revert "[HW6] Split processing and applying the event."" into lmp-dev
...
* commit '93114fa05f974fb6955937efe3207e025d5a82c5':
2015-03-20 23:21:00 +00:00
Ken Wakasa
dd221c390e
am 55387ba4: am 9fbeeb60: Merge "Revert "[HW7] Introduce consumed events"" into lmp-dev
...
* commit '55387ba41731460a412fe4f39c081ff9f6a550f2':
2015-03-20 23:20:58 +00:00
Ken Wakasa
ac8f245f6e
am cbffc447: am 2ce8799f: Merge "Revert "[HW8] Pull up the processed event."" into lmp-dev
...
* commit 'cbffc447e741876d13230097064642208aca6e69':
2015-03-20 23:20:56 +00:00
Ken Wakasa
0e298169f5
am 2706868d: am dc0c3e1e: Merge "Revert "[HW9] Pull the processed event further."" into lmp-dev
...
* commit '2706868d34362874511492856ea180386e3ea04f':
2015-03-20 23:20:54 +00:00
Ken Wakasa
c1bb4203b4
am e3fd9367: am e8ca3f40: Merge "Revert "[HW10] Pull the processed event in its eventual place"" into lmp-dev
...
* commit 'e3fd9367af79d3616e144023dc70bed077469b71':
2015-03-20 23:20:53 +00:00
Ying Wang
d90ba70707
am 0b2e2db9: am ece7240c: Don\'t build dicttool unless it\'s explicitly requested.
...
* commit '0b2e2db9192186f60ec587b019700e3ce83124b0':
2015-03-20 23:20:51 +00:00
Ken Wakasa
5405cd5890
am c9bba853: am 666f1b38: Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-dev
...
* commit 'c9bba853fa00f03bfc9b49931e320957adc15b20':
2015-03-20 23:20:43 +00:00
Jean Chalard
d372d05964
am 8a584a2f: am bcb61da5: [HW10] Pull the processed event in its eventual place
...
* commit '8a584a2f610c2baf6f343fdccfb1eae42eda4351':
2015-03-20 23:20:41 +00:00
Jean Chalard
3275324b84
am f5e55433: am a8d80ec0: [HW9] Pull the processed event further.
...
* commit 'f5e55433a307256fa13f14dcfb148815a7c52aca':
2015-03-20 23:20:40 +00:00
Jean Chalard
b20fdb0ce4
am 859ccd77: am 312c9498: Merge "[HW8] Pull up the processed event." into lmp-dev
...
* commit '859ccd77e3c91023829403e2afd600e9ade86977':
2015-03-20 23:20:38 +00:00
Jean Chalard
9b0084f020
am 8c932cbd: am 3c7cb523: Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-dev
...
* commit '8c932cbd0a9563d03e914051e6447728875e6c2b':
2015-03-20 23:20:36 +00:00
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
The Android Automerger
01b705589d
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-03-20 22:36:40 +00:00
Dan Zivkovic
812f49d8e1
am b98a0380: Fix InputLogicTests.
...
* commit 'b98a0380ffca8586d7f9f4eafd1a0ad7a8844f0b':
Fix InputLogicTests.
2015-03-20 21:22:18 +00:00
Dan Zivkovic
b98a0380ff
Fix InputLogicTests.
...
Change-Id: Ie319a6087297251e6b22ffd80014b69c746458e0
2015-03-20 14:13:25 -07:00
Ulas Kirazci
fd3e0175e5
DO NOT MERGE. Do not access metadatadb from main thread.
...
Also fix Refresh button replicating itself on orientation change.
Bug: 19786650
Change-Id: I19a964d69d9141ba6515bbe19a120d4685628fe3
2015-03-20 13:01:54 -07:00
The Android Automerger
c9cf97ddcc
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-03-20 19:00:28 +00:00
Dan Zivkovic
8eecbbd618
am c15bbb52: Retire Delight2 migration code to speed up tests.
...
* commit 'c15bbb52a37be751fed2ba7e765dfd7727306308':
Retire Delight2 migration code to speed up tests.
2015-03-20 18:54:20 +00:00
Dan Zivkovic
92d0dd0b83
am fe716f0f: Resolve some InputLogic todo comments.
...
* commit 'fe716f0f73ee551ce42b523983f92efccce79dc8':
Resolve some InputLogic todo comments.
2015-03-20 18:17:44 +00:00
Dan Zivkovic
a7cf04a394
am 5cf457c9: Remove external dictionary debug UI.
...
* commit '5cf457c976d69e05e3d93df0363f7a411b131bf9':
Remove external dictionary debug UI.
2015-03-20 18:17:42 +00:00
Dan Zivkovic
c15bbb52a3
Retire Delight2 migration code to speed up tests.
...
We're waiting 10 minutes for tests to run, and half of that time is spent in
depreacted code related to migration of Delight2 dictionary files.
LatinIME will never migrate another Delight2 dictionary file again, so we can
delete this code.
Change-Id: I05c7d8429e8d9a26139456763c77997340fea8c2
2015-03-20 11:16:46 -07:00
Dan Zivkovic
fe716f0f73
Resolve some InputLogic todo comments.
...
Change-Id: Ic3d7d11ad90cc09edf62f48aa5362e71d692f7dd
2015-03-20 10:49:15 -07:00