Commit graph

32853 commits

Author SHA1 Message Date
Ken Wakasa
026350a179 am e6a9f797: am 0b1fa0c1: Cleanup: C++11 doesn\'t require a space between angle brackets
* commit 'e6a9f7974721b0ec7fa5bf41fb1eafff4f41f9d0':
  Cleanup: C++11 doesn't require a space between angle brackets
2014-07-30 17:11:33 +00:00
Ken Wakasa
ae5ebb06cd am 93114fa0: am c4f6fc1e: Merge "Revert "[HW6] Split processing and applying the event."" into lmp-dev
* commit '93114fa05f974fb6955937efe3207e025d5a82c5':
  Revert "[HW6] Split processing and applying the event."
2014-07-30 17:11:32 +00:00
Ken Wakasa
06be57772f am 55387ba4: am 9fbeeb60: Merge "Revert "[HW7] Introduce consumed events"" into lmp-dev
* commit '55387ba41731460a412fe4f39c081ff9f6a550f2':
  Revert "[HW7] Introduce consumed events"
2014-07-30 17:11:30 +00:00
Ken Wakasa
17440d7ec8 am cbffc447: am 2ce8799f: Merge "Revert "[HW8] Pull up the processed event."" into lmp-dev
* commit 'cbffc447e741876d13230097064642208aca6e69':
  Revert "[HW8] Pull up the processed event."
2014-07-30 17:11:29 +00:00
Ken Wakasa
e69ca079c5 am 2706868d: am dc0c3e1e: Merge "Revert "[HW9] Pull the processed event further."" into lmp-dev
* commit '2706868d34362874511492856ea180386e3ea04f':
  Revert "[HW9] Pull the processed event further."
2014-07-30 17:11:28 +00:00
Ken Wakasa
c329457a06 am e3fd9367: am e8ca3f40: Merge "Revert "[HW10] Pull the processed event in its eventual place"" into lmp-dev
* commit 'e3fd9367af79d3616e144023dc70bed077469b71':
  Revert "[HW10] Pull the processed event in its eventual place"
2014-07-30 17:11:27 +00:00
Ying Wang
109f703023 am 0b2e2db9: am ece7240c: Don\'t build dicttool unless it\'s explicitly requested.
* commit '0b2e2db9192186f60ec587b019700e3ce83124b0':
  Don't build dicttool unless it's explicitly requested.
2014-07-29 18:09:09 +00:00
Ying Wang
0b2e2db919 am ece7240c: Don\'t build dicttool unless it\'s explicitly requested.
* commit 'ece7240c7ac09b1448998c202f991d0acd4bab01':
  Don't build dicttool unless it's explicitly requested.
2014-07-29 18:01:24 +00:00
Ying Wang
ece7240c7a Don't build dicttool unless it's explicitly requested.
It easily breaks the checkbuild.

Change-Id: I43b35fade550ff9d64782ea43cb6e3a804424830
2014-07-29 10:46:38 -07:00
Ken Wakasa
f570538536 am c9bba853: am 666f1b38: Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-dev
* commit 'c9bba853fa00f03bfc9b49931e320957adc15b20':
  Revert "[HW7.5] Introduce the @Nonnull annotation"
2014-07-29 15:53:12 +00:00
Ken Wakasa
c9bba853fa am 666f1b38: Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-dev
* commit '666f1b384f539c6426b9ee7bd6312005c69a3350':
  Revert "[HW7.5] Introduce the @Nonnull annotation"
2014-07-29 15:51:07 +00:00
Jean Chalard
e4f81d6b47 am 8a584a2f: am bcb61da5: [HW10] Pull the processed event in its eventual place
* commit '8a584a2f610c2baf6f343fdccfb1eae42eda4351':
  [HW10] Pull the processed event in its eventual place
2014-07-29 13:32:08 +00:00
Jean Chalard
b322e8c5d4 am f5e55433: am a8d80ec0: [HW9] Pull the processed event further.
* commit 'f5e55433a307256fa13f14dcfb148815a7c52aca':
  [HW9] Pull the processed event further.
2014-07-29 13:32:06 +00:00
Jean Chalard
5d5ab6a10c am 859ccd77: am 312c9498: Merge "[HW8] Pull up the processed event." into lmp-dev
* commit '859ccd77e3c91023829403e2afd600e9ade86977':
  [HW8] Pull up the processed event.
2014-07-29 13:32:05 +00:00
Jean Chalard
6bc87b96ce am 8c932cbd: am 3c7cb523: Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-dev
* commit '8c932cbd0a9563d03e914051e6447728875e6c2b':
  [HW7.5] Introduce the @Nonnull annotation
2014-07-29 13:32:03 +00:00
Jean Chalard
8c6778f9ca am 716c7d29: am 30424521: Merge "[HW7] Introduce consumed events" into lmp-dev
* commit '716c7d2923b0bd455dd9e0464c0dbf289ba76965':
  [HW7] Introduce consumed events
2014-07-29 13:32:02 +00:00
Keisuke Kuroyanagi
9173e73f20 am db72a4f6: am 6c3b0d3c: Merge "Add TrieMap." into lmp-dev
* commit 'db72a4f6862fbbd0bc0c9a2d165329b804baacf4':
  Add TrieMap.
2014-07-29 13:32:00 +00:00
Tadashi G. Takaoka
0f53ef0ab7 am 8172a681: am a715d7f6: Use fragment for keyboard theme settings
* commit '8172a681439501a755459ca755c1a877fec919d6':
  Use fragment for keyboard theme settings
2014-07-29 13:31:59 +00:00
Jean Chalard
caf539079d am 4591869d: am 6c39db9f: Merge "[HW6] Split processing and applying the event." into lmp-dev
* commit '4591869d562baef393b6ff63e90378401183dbc7':
  [HW6] Split processing and applying the event.
2014-07-29 13:31:58 +00:00
Keisuke Kuroyanagi
c2c1ecdd7d am 803a8241: am 2e32e83b: Merge "Get n-gram probability in structure policy." into lmp-dev
* commit '803a8241c14cea39c6fee49bc6be80797442e6f9':
  Get n-gram probability in structure policy.
2014-07-29 13:31:56 +00:00
Keisuke Kuroyanagi
b515cac572 am d4331c92: am 179f38cc: Merge "Change getUnigramProbabilityOfPtNode to getProbabilityOfPtNode()" into lmp-dev
* commit 'd4331c9294dae1f9769a97625a8a25bcd329b98a':
  Change getUnigramProbabilityOfPtNode to getProbabilityOfPtNode()
2014-07-29 13:31:55 +00:00
Jean Chalard
868c9ee44d am 1e2fb096: am 76ad2597: Merge "Improve the russian dictionary." into lmp-dev
* commit '1e2fb096143acc964ee9635c0448964b13a30c3a':
  Improve the russian dictionary.
2014-07-29 13:31:48 +00:00
Jean Chalard
8a584a2f61 am bcb61da5: [HW10] Pull the processed event in its eventual place
* commit 'bcb61da581edfef5120a7a38a5de98d35fa65255':
  [HW10] Pull the processed event in its eventual place
2014-07-29 13:14:43 +00:00
Jean Chalard
f5e55433a3 am a8d80ec0: [HW9] Pull the processed event further.
* commit 'a8d80ec01202633709d161fb01df0126602d4eb6':
  [HW9] Pull the processed event further.
2014-07-29 13:14:42 +00:00
Jean Chalard
859ccd77e3 am 312c9498: Merge "[HW8] Pull up the processed event." into lmp-dev
* commit '312c9498be299db7f323f9bd250328e016512e79':
  [HW8] Pull up the processed event.
2014-07-29 13:14:41 +00:00
Jean Chalard
8c932cbd0a am 3c7cb523: Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-dev
* commit '3c7cb5234fa33f67a4029d6e858ccccf5c7feeb3':
  [HW7.5] Introduce the @Nonnull annotation
2014-07-29 13:14:40 +00:00
Jean Chalard
716c7d2923 am 30424521: Merge "[HW7] Introduce consumed events" into lmp-dev
* commit '3042452170e9d8bd2d80abd7514b40b1974741f7':
  [HW7] Introduce consumed events
2014-07-29 13:14:39 +00:00
Keisuke Kuroyanagi
db72a4f686 am 6c3b0d3c: Merge "Add TrieMap." into lmp-dev
* commit '6c3b0d3caa8af9b513573486c12bddacd5f03d03':
  Add TrieMap.
2014-07-29 13:14:38 +00:00
Tadashi G. Takaoka
8172a68143 am a715d7f6: Use fragment for keyboard theme settings
* commit 'a715d7f6fd3b29e660d78f83815ebe75837f1436':
  Use fragment for keyboard theme settings
2014-07-29 13:14:37 +00:00
Jean Chalard
4591869d56 am 6c39db9f: Merge "[HW6] Split processing and applying the event." into lmp-dev
* commit '6c39db9f725b50177ce3bf5bd4ce38ff074fe0da':
  [HW6] Split processing and applying the event.
2014-07-29 13:14:35 +00:00
Keisuke Kuroyanagi
803a8241c1 am 2e32e83b: Merge "Get n-gram probability in structure policy." into lmp-dev
* commit '2e32e83b6ef88ea7429f96a797563a8032aa5347':
  Get n-gram probability in structure policy.
2014-07-29 13:14:34 +00:00
Keisuke Kuroyanagi
d4331c9294 am 179f38cc: Merge "Change getUnigramProbabilityOfPtNode to getProbabilityOfPtNode()" into lmp-dev
* commit '179f38cc8c79ee4f1d94a1ddc37a7644a263e4c1':
  Change getUnigramProbabilityOfPtNode to getProbabilityOfPtNode()
2014-07-29 13:14:33 +00:00
Jean Chalard
1e2fb09614 am 76ad2597: Merge "Improve the russian dictionary." into lmp-dev
* commit '76ad259764cf9aa4d8b0eba0ee708e79b02de86f':
  Improve the russian dictionary.
2014-07-29 13:14:31 +00:00
Jean Chalard
bcb61da581 [HW10] Pull the processed event in its eventual place
Change-Id: I9e13bb3efad557e9199021a344d8dff8215d97fa
2014-07-29 18:48:13 +09:00
Jean Chalard
a8d80ec012 [HW9] Pull the processed event further.
The 'processedEvent' variables will ultimately disappear entirely.

Change-Id: If44c68c1116faa9ca23e4ffeabe320704431ab3c
2014-07-29 18:38:49 +09:00
Tadashi G. Takaoka
a715d7f6fd Use fragment for keyboard theme settings
Bug: 11866784
Change-Id: Ic50b6eb1bd8f2b823e2c9dfad04d8615bc910936
2014-07-29 18:19:20 +09:00
Tadashi G. Takaoka
7c76da6d03 am eee0baad: am 76cffec7: Show "navigate up" icon on settings activity
* commit 'eee0baad2e7ac239cda55e675faaebd9642c21d3':
  Show "navigate up" icon on settings activity
2014-07-29 03:16:59 +00:00
Tadashi G. Takaoka
eee0baad2e am 76cffec7: Show "navigate up" icon on settings activity
* commit '76cffec78834a2db525608587eae1a5a7ef998dd':
  Show "navigate up" icon on settings activity
2014-07-29 03:13:35 +00:00
Tadashi G. Takaoka
76cffec788 Show "navigate up" icon on settings activity
Bug: 15813742
Change-Id: I8b1feb5c35377e62199e5a909640d9c50f970654
2014-07-29 12:05:48 +09:00
Tadashi G. Takaoka
973c7abefe am af6cfb36: am 8ca3eb67: Merge "Update Material icons and backgrounds" into lmp-dev
* commit 'af6cfb36cf15883022a527a3d47f53c18c259041':
  Update Material icons and backgrounds
2014-07-29 02:49:36 +00:00
Tadashi G. Takaoka
af6cfb36cf am 8ca3eb67: Merge "Update Material icons and backgrounds" into lmp-dev
* commit '8ca3eb67d2074493751d3ff0fefed62bbfedad8c':
  Update Material icons and backgrounds
2014-07-29 02:46:17 +00:00
Keisuke Kuroyanagi
e642693a59 am 5e6431ce: am c6862ee6: Merge "Allow adding DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev
* commit '5e6431ce32e27d2cdc9e05ea24a7005a3c541386':
  Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.
2014-07-29 01:59:51 +00:00
Keisuke Kuroyanagi
5e6431ce32 am c6862ee6: Merge "Allow adding DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev
* commit 'c6862ee699e8c410f11a63c0dc0d7d6465117511':
  Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.
2014-07-29 01:55:26 +00:00
Keisuke Kuroyanagi
bcc6b52b74 am 7d48233e: am 6850ea0e: Merge "Add boundary check for ver2 bigram reading." into lmp-dev
* commit '7d48233e72296bd7d7567f4e8ee90cb55d812371':
  Add boundary check for ver2 bigram reading.
2014-07-29 01:42:53 +00:00
Keisuke Kuroyanagi
7d48233e72 am 6850ea0e: Merge "Add boundary check for ver2 bigram reading." into lmp-dev
* commit '6850ea0ee5da6c85907f2173b58a260e6c859101':
  Add boundary check for ver2 bigram reading.
2014-07-29 01:39:11 +00:00
Jean Chalard
37f701dfa0 am b6a75d10: am 036b83f4: Merge "Wait for an event before actually realizing it" into lmp-dev
* commit 'b6a75d10de3ab43dcf318fde77e81918fc55e02b':
  Wait for an event before actually realizing it
2014-07-28 12:14:29 +00:00
Tadashi G. Takaoka
4c6e8e70fb am 5fc43eb0: am 1e491d90: Merge "Use fragment for advanced preference screen" into lmp-dev
* commit '5fc43eb04df9870fb6256d8d3918e7d399ca8a79':
  Use fragment for advanced preference screen
2014-07-28 12:14:28 +00:00
Keisuke Kuroyanagi
4de1ca67d7 am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':
  Fix NPE when context.getFilesDir() returns null.
2014-07-28 12:14:26 +00:00
Tadashi G. Takaoka
cd4799fdf9 am 1f5881b7: am 9ba85413: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
* commit '1f5881b752b9b8e527b00e14150cfedd916513ce':
  Refactor Debug settings to use SubScreenFragment
2014-07-28 12:14:25 +00:00
Tadashi G. Takaoka
a8765daeec am b1067103: am 633f1a5e: Merge "Use fragment for text correction preference screen" into lmp-dev
* commit 'b1067103343c9b196e0a9276f3e9f7c20b6def86':
  Use fragment for text correction preference screen
2014-07-28 12:14:24 +00:00