aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4094dd7f: am 82d98e7a: am 4efb5c3b: Merge "Remove uncommit on reverting ↵Kurt Partridge2013-09-260-0/+0
|\ | | | | | | | | | | batch input" * commit '4094dd7fe641aa2706666acfec9e460b99460973':
| * am 82d98e7a: am 4efb5c3b: Merge "Remove uncommit on reverting batch input"Kurt Partridge2013-09-260-0/+0
| |\ | | | | | | | | | * commit '82d98e7a4809c7341032b452f51c10a2e7d003fd':
* | | am 1e1d2abd: am fe712a29: am f497e1e5: Move suggest_options.h to suggest/coreKen Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | * commit '1e1d2abd29a9ab74db599b630968f736f40a0647':
| * | am fe712a29: am f497e1e5: Move suggest_options.h to suggest/coreKen Wakasa2013-09-260-0/+0
| |\ \ | | | | | | | | | | | | * commit 'fe712a295c8839081bb266c75ec0afb4df613444':
* | | | am 30de4e06: am 8ff5c03b: am 712fefd8: Merge "Use BinaryDictonaryInfo ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | instead of raw pointers." * commit '30de4e068c5c2c9d90d8ff9d4a0301ed0f3c068d':
| * | | am 8ff5c03b: am 712fefd8: Merge "Use BinaryDictonaryInfo instead of raw ↵Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | pointers." * commit '8ff5c03bf04cafe95ed30a1cb17e3a4379fe177b':
* | | | | am c9fa8db0: am 12e2bd25: am 88ad30f4: Move dictionary format independent ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | probability calculation methods to ProbabilityUtils. * commit 'c9fa8db0dfbe9fa8c266df813fd7127b1d186676':
| * | | | am 12e2bd25: am 88ad30f4: Move dictionary format independent probability ↵Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calculation methods to ProbabilityUtils. * commit '12e2bd25752c60fe3141f76be2bc8e9e1db46e94':
* | | | | | am 7ea32c70: (-s ours) am 8c5fec2b: (-s ours) am d3ccd4bf: (-s ours) Merge ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" * commit '7ea32c7024ebf08059072aa3a2347d5336b4c34a':
| * | | | | am 8c5fec2b: (-s ours) am d3ccd4bf: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit '8c5fec2bd82006da1a985a0a1becb61c23fcd8d3':
* | | | | | | am e53f5b8a: am f80e2abb: am 1dae936f: Merge "Move char_utils to the ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary directory" * commit 'e53f5b8af438e85fd39eeef6c41b71c04313dfd5':
| * | | | | | am f80e2abb: am 1dae936f: Merge "Move char_utils to the dictionary directory"Ken Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f80e2abb0cdfceba3f30c08559c7ffcebb153797':
* | | | | | | | am a8f8dab6: am f6a4670d: am 26f48949: Fix the displayed status after downloadJean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8f8dab664f0102728b1a4ec0d0e6fd9c7051031':
| * | | | | | | am f6a4670d: am 26f48949: Fix the displayed status after downloadJean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6a4670d1c82111e825fb59f8afdbb4ca4d6719b':
* | | | | | | | | am cc9f726b: am fcdb85b3: am f61999ca: Merge "Make it easy to open several ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionaries from tests" * commit 'cc9f726b2a182ea19ae72db4048641d5391a6eac':
| * | | | | | | | am fcdb85b3: am f61999ca: Merge "Make it easy to open several dictionaries ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from tests" * commit 'fcdb85b37a4a41589e5e81cb69e3b4a0db15c875':
* | | | | | | | | | am 063513c3: am 8a7acf14: am a0c3e02d: Refactor SuggestionStripLayoutHelper ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bit * commit '063513c3e4009c5027f204eefc254133f3693473':
| * | | | | | | | | am 8a7acf14: am a0c3e02d: Refactor SuggestionStripLayoutHelper a bitTadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a7acf147dc739da26034f2711b73e5839471c1e':
* | | | | | | | | | | am 27615a0c: am 0ef1e623: am 70c2dcff: am 6f7e39a6: am e7514a6a: Merge "Add ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev * commit '27615a0c97050c62f81acc22dc33b92f1ccf7e4c':
| * | | | | | | | | | am 0ef1e623: am 70c2dcff: am 6f7e39a6: am e7514a6a: Merge "Add vibration ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | override values for Galaxy S4 and HTC One" into jb-mr2-dev * commit '0ef1e6234ccc625589920694456ce45a44d48fec':
* | | | | | | | | | | | am abcb3246: (-s ours) am 1ba68664: (-s ours) am 5989c9b8: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE * commit 'abcb3246952abe79d647f5e4a8278a4d7dcd0785':
| * | | | | | | | | | | am 1ba68664: (-s ours) am 5989c9b8: (-s ours) am ea11a8ef: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dee9d17c: (-s ours) Import translations. DO NOT MERGE * commit '1ba686640876fb46873c97ac487cb87b8143ae0b':
* | | | | | | | | | | | | am 88688eb5: am 015d542f: am 723391c9: Merge "Tidy up Utils class a bit"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88688eb5009d4d3b7656ac6c4e2bd92d19aaf8bf':
| * | | | | | | | | | | | am 015d542f: am 723391c9: Merge "Tidy up Utils class a bit"Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '015d542fa952d7969e288bdd47eeeb3929663b97':
* | | | | | | | | | | | | | am c1863812: am 68d17aea: am f88f9dbb: Move "#define LOG_TAG" before include ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defines.h. * commit 'c18638123270f5038ce95f639087ddc1e999c408':
| * | | | | | | | | | | | | am 68d17aea: am f88f9dbb: Move "#define LOG_TAG" before include defines.h.Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68d17aea659eefbca7179a2aeb9429bfd71f713e':
* | | | | | | | | | | | | | | am 3b03696f: am 502ff085: am e6125db9: Merge "Catch a permission exception"Kurt Partridge2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b03696f928629c7c722cb55004a2745dc9301c0':
| * | | | | | | | | | | | | | am 502ff085: am e6125db9: Merge "Catch a permission exception"Kurt Partridge2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '502ff085125887f8a8eafd2ceb56a2a1fa483555':
* | | | | | | | | | | | | | | | am fc027445: am e203961d: am a65c267b: Move some dictionary related ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementations to the dictionary directory * commit 'fc027445cd68baa76e2983c1e9c442f06c84041e':
| * | | | | | | | | | | | | | | am e203961d: am a65c267b: Move some dictionary related implementations to ↵Ken Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dictionary directory * commit 'e203961dd6fa590fe5946a4b06f55a81218c2290':
* | | | | | | | | | | | | | | | | am 18e322a5: am 15c671a3: am 7097aa2d: Merge "Cleanup unreadable variable names"Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18e322a5ddd449569716369b41917fde4602a167':
| * | | | | | | | | | | | | | | | am 15c671a3: am 7097aa2d: Merge "Cleanup unreadable variable names"Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15c671a3b67c6dc9d7e644d2913a58acedf961d4':
* | | | | | | | | | | | | | | | | | am bad26b8d: am 08870866: am d67db32b: Merge "Separate ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SuggestionStripLayoutHelper for readablity" * commit 'bad26b8d498d087dbb65537deb73da13f75986c7':
| * | | | | | | | | | | | | | | | | am 08870866: am d67db32b: Merge "Separate SuggestionStripLayoutHelper for ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readablity" * commit '08870866cbc986f997120be222d704af7b30563c':
* | | | | | | | | | | | | | | | | | | am 87dfe42d: am 4647c4c7: am 424a173d: Merge "Move ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional_proximity_chars to the layout directory" * commit '87dfe42d548237711b555ce35d7341d5435916af':
| * | | | | | | | | | | | | | | | | | am 4647c4c7: am 424a173d: Merge "Move additional_proximity_chars to the ↵Ken Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout directory" * commit '4647c4c78efef4d096c11b1a2424ef49813d6ded':
* | | | | | | | | | | | | | | | | | | | am 3ff43de9: am 9a28541e: am 1a50999e: Merge "Tell the text view we reset ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state on finish input" * commit '3ff43de98ad975a9e2ea7f42a1fa98f7c7cd01ba':
| * | | | | | | | | | | | | | | | | | | am 9a28541e: am 1a50999e: Merge "Tell the text view we reset state on finish ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input" * commit '9a28541e05abdb0d4a603274faaab9cc815581b2':
* | | | | | | | | | | | | | | | | | | | | am 68fc2ce3: am 46b9bd06: am faa7fbfa: Merge "Fix two strict mode warnings."Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68fc2ce3e94bc870924c9aae9aaab58b391c4d93':
| * | | | | | | | | | | | | | | | | | | | am 46b9bd06: am faa7fbfa: Merge "Fix two strict mode warnings."Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46b9bd068ad896ba1ae8fc941c5ae172f8a520f8':
* | | | | | | | | | | | | | | | | | | | | | am 9f68bc67: am f002debd: am 29432f84: Create a new directory for ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout-related implementations * commit '9f68bc67f1a10d6c4b5a9867b48364a0531ca71a':
| * | | | | | | | | | | | | | | | | | | | | am f002debd: am 29432f84: Create a new directory for layout-related ↵Ken Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementations * commit 'f002debdfe46d561f5d846e4a9ad8d3f331d3540':
* | | | | | | | | | | | | | | | | | | | | | | am f7de9f2c: am fd2f09ae: am 8eb214d7: Merge "Fix dictionary pack preference ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order." * commit 'f7de9f2ceee1728ab7d54a761c50d85621c4157a':
| * | | | | | | | | | | | | | | | | | | | | | am fd2f09ae: am 8eb214d7: Merge "Fix dictionary pack preference order."Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd2f09aee87ee344da9cabefd8381d56dd9e6df4':
* | | | | | | | | | | | | | | | | | | | | | | | am 05d56232: am b6822188: am ec9670ac: Merge "Rub some butter on dictionary ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list scrolling." * commit '05d562328a5fca38ef76ac1d5192983b213febc4':
| * | | | | | | | | | | | | | | | | | | | | | | am b6822188: am ec9670ac: Merge "Rub some butter on dictionary list scrolling."Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b6822188fa07272d1f5db5112705824d8b0ec938':
* | | | | | | | | | | | | | | | | | | | | | | | | am 76aff5f3: am 01d88100: am 2ebe2009: Merge "Make DicTraverseSession having ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggest options." * commit '76aff5f3231a5a84773da4551030b4701e9df220':
| * | | | | | | | | | | | | | | | | | | | | | | | am 01d88100: am 2ebe2009: Merge "Make DicTraverseSession having suggest ↵Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options." * commit '01d8810007de3f9d3709a3566654b195b1749473':
* | | | | | | | | | | | | | | | | | | | | | | | | | am 2a1a2a84: (-s ours) am 2d5e13ec: (-s ours) am b4b72d43: (-s ours) Merge ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" * commit '2a1a2a846f3f494ce19475d4d13589dfac9bc675':
| * | | | | | | | | | | | | | | | | | | | | | | | | am 2d5e13ec: (-s ours) am b4b72d43: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit '2d5e13ec31b2d1dfe9aca4c46aaad0dad10aba4b':