aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | am e3fd9367: am e8ca3f40: Merge "Revert "[HW10] Pull the processed event in ↵Ken Wakasa2014-07-301-9/+6
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | its eventual place"" into lmp-dev * commit 'e3fd9367af79d3616e144023dc70bed077469b71': Revert "[HW10] Pull the processed event in its eventual place"
| | * | | | | Merge "Revert "[HW10] Pull the processed event in its eventual place"" into ↵Ken Wakasa2014-07-251-9/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | | * | | | | Revert "[HW10] Pull the processed event in its eventual place"Ken Wakasa2014-07-301-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bcb61da581edfef5120a7a38a5de98d35fa65255. Reverting due to a few critical bugs and unit test failures. Change-Id: I5f7ee2c7883496ed36e56b3ef12fac91f85f9866
* | | | | | | | am f5705385: am c9bba853: am 666f1b38: Merge "Revert "[HW7.5] Introduce the ↵Ken Wakasa2014-07-296-16/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @Nonnull annotation"" into lmp-dev * commit 'f5705385360e7f660b3f899480396a06a1dc6079': Revert "[HW7.5] Introduce the @Nonnull annotation"
| * | | | | | | am c9bba853: am 666f1b38: Merge "Revert "[HW7.5] Introduce the @Nonnull ↵Ken Wakasa2014-07-296-16/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | annotation"" into lmp-dev * commit 'c9bba853fa00f03bfc9b49931e320957adc15b20': Revert "[HW7.5] Introduce the @Nonnull annotation"
| | * | | | | | Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-devKen Wakasa2014-07-246-16/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Revert "[HW7.5] Introduce the @Nonnull annotation"Ken Wakasa2014-07-296-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 60a2cd8ac439bf41bfddc5f5f339feda7c7ff175. Reverting due to build breakage under the unbundled branch. Change-Id: Iab2988c53884166f62c95da920ac7a7079a0e5a0
* | | | | | | | am e4f81d6b: am 8a584a2f: am bcb61da5: [HW10] Pull the processed event in ↵Jean Chalard2014-07-291-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | its eventual place * commit 'e4f81d6b4700a54fddd0bca27926ebc65591a427': [HW10] Pull the processed event in its eventual place
| * | | | | | | am 8a584a2f: am bcb61da5: [HW10] Pull the processed event in its eventual placeJean Chalard2014-07-291-6/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a584a2f610c2baf6f343fdccfb1eae42eda4351': [HW10] Pull the processed event in its eventual place
| | * | | | | | [HW10] Pull the processed event in its eventual placeJean Chalard2014-07-291-6/+9
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Change-Id: I9e13bb3efad557e9199021a344d8dff8215d97fa
* | | | | | | am b322e8c5: am f5e55433: am a8d80ec0: [HW9] Pull the processed event further.Jean Chalard2014-07-291-8/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b322e8c5d4aa7e47bb5851ee4accbbd4085e97db': [HW9] Pull the processed event further.
| * | | | | | am f5e55433: am a8d80ec0: [HW9] Pull the processed event further.Jean Chalard2014-07-291-8/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5e55433a307256fa13f14dcfb148815a7c52aca': [HW9] Pull the processed event further.
| | * | | | | [HW9] Pull the processed event further.Jean Chalard2014-07-291-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'processedEvent' variables will ultimately disappear entirely. Change-Id: If44c68c1116faa9ca23e4ffeabe320704431ab3c
* | | | | | | am 5d5ab6a1: am 859ccd77: am 312c9498: Merge "[HW8] Pull up the processed ↵Jean Chalard2014-07-291-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event." into lmp-dev * commit '5d5ab6a10c6180461ac5a7020511b4356b9cc5d0': [HW8] Pull up the processed event.
| * | | | | | am 859ccd77: am 312c9498: Merge "[HW8] Pull up the processed event." into ↵Jean Chalard2014-07-291-5/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '859ccd77e3c91023829403e2afd600e9ade86977': [HW8] Pull up the processed event.
| | * | | | | Merge "[HW8] Pull up the processed event." into lmp-devJean Chalard2014-07-251-5/+5
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | [HW8] Pull up the processed event.Jean Chalard2014-07-291-5/+5
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: If4baba0af2e88627f22b5e7312948fc3d9c5a25f
* | | | | | am 6bc87b96: am 8c932cbd: am 3c7cb523: Merge "[HW7.5] Introduce the @Nonnull ↵Jean Chalard2014-07-296-5/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | annotation" into lmp-dev * commit '6bc87b96ce25887bb8bfe561308a65204152c577': [HW7.5] Introduce the @Nonnull annotation
| * | | | | am 8c932cbd: am 3c7cb523: Merge "[HW7.5] Introduce the @Nonnull annotation" ↵Jean Chalard2014-07-296-5/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '8c932cbd0a9563d03e914051e6447728875e6c2b': [HW7.5] Introduce the @Nonnull annotation
| | * | | | Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-devJean Chalard2014-07-246-5/+16
| | |\| | |
| | | * | | [HW7.5] Introduce the @Nonnull annotationJean Chalard2014-07-296-5/+16
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I1f69ea704056943fa3371ff610e2d8181ead2376
* | | | | am 8c6778f9: am 716c7d29: am 30424521: Merge "[HW7] Introduce consumed ↵Jean Chalard2014-07-295-15/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events" into lmp-dev * commit '8c6778f9ca6c09fa1034168ae13b68cea93f9420': [HW7] Introduce consumed events
| * | | | am 716c7d29: am 30424521: Merge "[HW7] Introduce consumed events" into lmp-devJean Chalard2014-07-295-15/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '716c7d2923b0bd455dd9e0464c0dbf289ba76965': [HW7] Introduce consumed events
| | * | | Merge "[HW7] Introduce consumed events" into lmp-devJean Chalard2014-07-255-15/+31
| | |\| |
| | | * | [HW7] Introduce consumed eventsJean Chalard2014-07-295-15/+31
| | | |/ | | | | | | | | | | | | Change-Id: Ic2d95d19b1ac66e3e97e4a16187ce5aecb4ac678
* | | | am 0f53ef0a: am 8172a681: am a715d7f6: Use fragment for keyboard theme settingsTadashi G. Takaoka2014-07-2911-100/+266
|\| | | | | | | | | | | | | | | | | | | * commit '0f53ef0ab78277af74a22249e999a8ee62dd2c63': Use fragment for keyboard theme settings
| * | | am 8172a681: am a715d7f6: Use fragment for keyboard theme settingsTadashi G. Takaoka2014-07-2911-100/+266
| |\| | | | | | | | | | | | | | | | | | * commit '8172a681439501a755459ca755c1a877fec919d6': Use fragment for keyboard theme settings
| | * | Use fragment for keyboard theme settingsTadashi G. Takaoka2014-07-2911-100/+266
| | |/ | | | | | | | | | | | | Bug: 11866784 Change-Id: Ic50b6eb1bd8f2b823e2c9dfad04d8615bc910936
* | | am caf53907: am 4591869d: am 6c39db9f: Merge "[HW6] Split processing and ↵Jean Chalard2014-07-293-9/+29
|\| | | | | | | | | | | | | | | | | | | | applying the event." into lmp-dev * commit 'caf539079d8e02f2f9f4b50a933d3df55c6e85c1': [HW6] Split processing and applying the event.
| * | am 4591869d: am 6c39db9f: Merge "[HW6] Split processing and applying the ↵Jean Chalard2014-07-293-9/+29
| |\| | | | | | | | | | | | | | | | | | | event." into lmp-dev * commit '4591869d562baef393b6ff63e90378401183dbc7': [HW6] Split processing and applying the event.
| | * [HW6] Split processing and applying the event.Jean Chalard2014-07-293-9/+29
| | | | | | | | | | | | | | | | | | If anyone has better names for those... Change-Id: Ia2dfc75381816bd688948647e2c50c10657b9e89
* | | am 868c9ee4: am 1e2fb096: am 76ad2597: Merge "Improve the russian ↵Jean Chalard2014-07-291-0/+0
|\| | | | | | | | | | | | | | | | | | | | dictionary." into lmp-dev * commit '868c9ee44d047d91caed053d96f95e8aecac81b4': Improve the russian dictionary.
| * | am 1e2fb096: am 76ad2597: Merge "Improve the russian dictionary." into lmp-devJean Chalard2014-07-291-0/+0
| |\| | | | | | | | | | | | | * commit '1e2fb096143acc964ee9635c0448964b13a30c3a': Improve the russian dictionary.
| | * Merge "Improve the russian dictionary." into lmp-devJean Chalard2014-07-251-0/+0
| | |\
| | | * Improve the russian dictionary.Jean Chalard2014-07-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted: 38 words Probability adjusted: 11 words Added: 1299 words [Category diff] +1 15 -1 0 +2 0 -2 0 +3 0 -3 0 +4 0 -4 0 +5 0 -5 3 +6 1 -6 0 +7 0 -7 13 [Weighted category diff] +1 15 -1 0 +2 0 -2 0 +3 0 -3 0 +4 0 -4 0 +5 0 -5 3 +6 1 -6 0 +7 0 -7 13 Change-Id: I1a6513954d60b30738cb849578ce535c5e05eb1a
* | | | am 7c76da6d: am eee0baad: am 76cffec7: Show "navigate up" icon on settings ↵Tadashi G. Takaoka2014-07-292-11/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | activity * commit '7c76da6d03e2cc87ca39691c3490c20c65fafa1d': Show "navigate up" icon on settings activity
| * | | am eee0baad: am 76cffec7: Show "navigate up" icon on settings activityTadashi G. Takaoka2014-07-292-11/+34
| |\| | | | | | | | | | | | | | | | | | * commit 'eee0baad2e7ac239cda55e675faaebd9642c21d3': Show "navigate up" icon on settings activity
| | * | Show "navigate up" icon on settings activityTadashi G. Takaoka2014-07-292-11/+34
| | | | | | | | | | | | | | | | | | | | Bug: 15813742 Change-Id: I8b1feb5c35377e62199e5a909640d9c50f970654
* | | | am 973c7abe: am af6cfb36: am 8ca3eb67: Merge "Update Material icons and ↵Tadashi G. Takaoka2014-07-2978-12/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | backgrounds" into lmp-dev * commit '973c7abefef7598817dec744e8925777b80eeb5c': Update Material icons and backgrounds
| * | | am af6cfb36: am 8ca3eb67: Merge "Update Material icons and backgrounds" into ↵Tadashi G. Takaoka2014-07-2978-12/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'af6cfb36cf15883022a527a3d47f53c18c259041': Update Material icons and backgrounds
| | * | Merge "Update Material icons and backgrounds" into lmp-devTadashi G. Takaoka2014-07-2478-12/+7
| | |\ \
| | | * | Update Material icons and backgroundsTadashi G. Takaoka2014-07-2978-12/+7
| | | |/ | | | | | | | | | | | | | | | | Bug: 16143083 Change-Id: I6396f725b30e9ef6fa7964a0c9d7eb6d1d97e376
* | | | am e642693a: am 5e6431ce: am c6862ee6: Merge "Allow adding ↵Keisuke Kuroyanagi2014-07-294-7/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev * commit 'e642693a59f919aa0d124358cc352d22510a39db': Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.
| * | | am 5e6431ce: am c6862ee6: Merge "Allow adding ↵Keisuke Kuroyanagi2014-07-294-7/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev * commit '5e6431ce32e27d2cdc9e05ea24a7005a3c541386': Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.
| | * | Merge "Allow adding DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-devKeisuke Kuroyanagi2014-07-254-7/+6
| | |\ \ | | | |/ | | |/|
| | | * Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.Keisuke Kuroyanagi2014-07-284-7/+6
| | | | | | | | | | | | | | | | | | | | Bug: 12725817 Change-Id: Ib9b30473ba94242a7b97ccd3b850068f596a5d17
* | | | am 37f701df: am b6a75d10: am 036b83f4: Merge "Wait for an event before ↵Jean Chalard2014-07-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | actually realizing it" into lmp-dev * commit '37f701dfa09f303f45c3c0494482c8ae9694b4e1': Wait for an event before actually realizing it
| * | | am b6a75d10: am 036b83f4: Merge "Wait for an event before actually realizing ↵Jean Chalard2014-07-281-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | it" into lmp-dev * commit 'b6a75d10de3ab43dcf318fde77e81918fc55e02b': Wait for an event before actually realizing it
| | * | Merge "Wait for an event before actually realizing it" into lmp-devJean Chalard2014-07-251-1/+1
| | |\ \
| | | * | Wait for an event before actually realizing itJean Chalard2014-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would wrongly emit a 'timeout' log entry when switching between two instances of the same language. Change-Id: I56e5de121b87f3e762b58f0b2a77e9abc784036e