Commit graph

16179 commits

Author SHA1 Message Date
The Android Open Source Project
986911101e am 61adf619: (-s ours) am ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '61adf61981ee203db6e3ac80e73297bdf2cb75f9':
2013-09-26 05:46:38 -07:00
Tadashi G. Takaoka
5834fbb979 am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"
* commit '15aab5b1fe918c055502f26a4326bcb70d265bbd':
2013-09-26 05:46:36 -07:00
Kurt Partridge
4dfaaae824 am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"
* commit 'afbaac36a88bf78d121be339898fdc90d075de81':
2013-09-26 05:46:31 -07:00
Ken Wakasa
2f3ac8e805 am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit '3888cc243d7f25b5d5b2cf57d0ca5833fe700d71':
2013-09-26 05:46:28 -07:00
Satoshi Kataoka
1b09a3f32f am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"
* commit 'b593ec88ee086e9767f6422d27163306a64e4b77':
2013-09-26 05:46:25 -07:00
Ken Wakasa
b5cda65825 am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
* commit '887b635dc42ab2686b414650ffffe2e5c402de34':
2013-09-26 05:46:19 -07:00
Satoshi Kataoka
130e1f95f9 am 31bd7b17: am cbb1ee48: Fix build
* commit '31bd7b17703e4f61525f40560028e732d4a7059a':
2013-09-26 05:46:17 -07:00
Tadashi G. Takaoka
f2beae9e53 am adf68c58: am b4ae86f0: Merge "Rename methods for readability"
* commit 'adf68c5828d1647680113a99c6b77e8b920da0af':
2013-09-26 05:46:14 -07:00
Satoshi Kataoka
b65bee7a4d am f4f547f0: am dceebee4: Purge UnigramDictionary
* commit 'f4f547f0e7874526d5b02126a3c01cca17534af6':
2013-09-26 05:46:12 -07:00
Satoshi Kataoka
6d811db75b am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"
* commit 'c8335703d404ec98a4971f7fde577a8f239391c5':
2013-09-26 05:46:09 -07:00
Tadashi G. Takaoka
9edecd76c8 am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture typing starts"
* commit '3e543e27259144d63a5d18074724f299e096af49':
2013-09-26 05:46:06 -07:00
Satoshi Kataoka
33bb4fa5d0 am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2
* commit 'b7974e8c270bdae90ab40bdf216730a3ce8b7056':
2013-09-26 05:46:04 -07:00
Satoshi Kataoka
e82cfe1fac am 9b5d603e: am e0bbb98d: Fix build
* commit '9b5d603e17b1bae2d8619110f24c5777c92fd7fa':
2013-09-26 05:46:01 -07:00
Satoshi Kataoka
cdf85ea5c5 am b4379f9c: am 01cae939: Move obsolete files to obsolete dir
* commit 'b4379f9c485b3872388d4c5de517c9c93ce3a231':
2013-09-26 05:45:58 -07:00
Jean Chalard
f1f39730bf am 994b2858: am 3b94fd7b: Merge "Update dictionaries"
* commit '994b285875181469c8e19338becabc147781bd0c':
2013-09-26 05:45:56 -07:00
Satoshi Kataoka
a4fa26812d am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapper
* commit '26ae9aa8488071b85aa95fe43ff7fef6862197ed':
2013-09-26 05:25:20 -07:00
Tadashi G. Takaoka
4eb8117d1a am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"
* commit 'c6b7cd3524f8df3d011632392cd3b302269d5fa1':
2013-09-26 05:25:18 -07:00
Kurt Partridge
15f3de266e am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"
* commit '420532cc3aae2e68ce266e135178c5e0e8d88c8b':
2013-09-26 05:25:16 -07:00
Satoshi Kataoka
52831bacdf am b13b977d: am d1811204: Move bigram_dictionary
* commit 'b13b977ddd7bc1b6d811812cebbbf29c825db06c':
2013-09-26 05:25:13 -07:00
Ken Wakasa
aa512f2400 am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"
* commit '67942c485017840631ee5694814402aceccc426c':
2013-09-26 05:25:11 -07:00
Kurt Partridge
9dcb846db3 am ef827a99: am a2f3f17d: Merge "Compare scrubbed strings when uncommitting LogUnits"
* commit 'ef827a99d073eed0a92271b6fe715b0868e1bb78':
2013-09-26 05:25:08 -07:00
Kurt Partridge
41da00d369 am 173ac0c6: am 74330288: Merge "Uncommit separator LogUnits"
* commit '173ac0c60d9878a56fea1e74be4cc07cc87df13d':
2013-09-26 05:25:06 -07:00
Kurt Partridge
84e4a9bf72 am a856138c: am 3d209462: Merge "Uncommit LogUnits when reverting textInput"
* commit 'a856138c49a569fc72c227f44dc3862f7d1d8e1e':
2013-09-26 05:25:03 -07:00
Kurt Partridge
4094dd7fe6 am 82d98e7a: am 4efb5c3b: Merge "Remove uncommit on reverting batch input"
* commit '82d98e7a4809c7341032b452f51c10a2e7d003fd':
2013-09-26 05:25:00 -07:00
Ken Wakasa
1e1d2abd29 am fe712a29: am f497e1e5: Move suggest_options.h to suggest/core
* commit 'fe712a295c8839081bb266c75ec0afb4df613444':
2013-09-26 05:24:58 -07:00
Keisuke Kuroyanagi
30de4e068c am 8ff5c03b: am 712fefd8: Merge "Use BinaryDictonaryInfo instead of raw pointers."
* commit '8ff5c03bf04cafe95ed30a1cb17e3a4379fe177b':
2013-09-26 05:24:55 -07:00
Keisuke Kuroyanagi
c9fa8db0df am 12e2bd25: am 88ad30f4: Move dictionary format independent probability calculation methods to ProbabilityUtils.
* commit '12e2bd25752c60fe3141f76be2bc8e9e1db46e94':
2013-09-26 05:24:53 -07:00
Baligh Uddin
7ea32c7024 am 8c5fec2b: (-s ours) am d3ccd4bf: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '8c5fec2bd82006da1a985a0a1becb61c23fcd8d3':
2013-09-26 05:24:46 -07:00
Ken Wakasa
e53f5b8af4 am f80e2abb: am 1dae936f: Merge "Move char_utils to the dictionary directory"
* commit 'f80e2abb0cdfceba3f30c08559c7ffcebb153797':
2013-09-26 05:24:44 -07:00
Jean Chalard
a8f8dab664 am f6a4670d: am 26f48949: Fix the displayed status after download
* commit 'f6a4670d1c82111e825fb59f8afdbb4ca4d6719b':
2013-09-26 05:24:41 -07:00
Jean Chalard
cc9f726b2a am fcdb85b3: am f61999ca: Merge "Make it easy to open several dictionaries from tests"
* commit 'fcdb85b37a4a41589e5e81cb69e3b4a0db15c875':
2013-09-26 05:24:39 -07:00
Tadashi G. Takaoka
063513c3e4 am 8a7acf14: am a0c3e02d: Refactor SuggestionStripLayoutHelper a bit
* commit '8a7acf147dc739da26034f2711b73e5839471c1e':
2013-09-26 05:24:36 -07:00
Tadashi G. Takaoka
27615a0c97 am 0ef1e623: am 70c2dcff: am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
* commit '0ef1e6234ccc625589920694456ce45a44d48fec':
2013-09-26 05:24:34 -07:00
Baligh Uddin
abcb324695 am 1ba68664: (-s ours) am 5989c9b8: (-s ours) am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE
* commit '1ba686640876fb46873c97ac487cb87b8143ae0b':
2013-09-26 05:24:32 -07:00
Tadashi G. Takaoka
88688eb500 am 015d542f: am 723391c9: Merge "Tidy up Utils class a bit"
* commit '015d542fa952d7969e288bdd47eeeb3929663b97':
2013-09-26 05:24:29 -07:00
Keisuke Kuroyanagi
c186381232 am 68d17aea: am f88f9dbb: Move "#define LOG_TAG" before include defines.h.
* commit '68d17aea659eefbca7179a2aeb9429bfd71f713e':
2013-09-26 05:24:25 -07:00
Kurt Partridge
3b03696f92 am 502ff085: am e6125db9: Merge "Catch a permission exception"
* commit '502ff085125887f8a8eafd2ceb56a2a1fa483555':
2013-09-26 05:24:22 -07:00
Ken Wakasa
fc027445cd am e203961d: am a65c267b: Move some dictionary related implementations to the dictionary directory
* commit 'e203961dd6fa590fe5946a4b06f55a81218c2290':
2013-09-26 05:24:20 -07:00
Tadashi G. Takaoka
18e322a5dd am 15c671a3: am 7097aa2d: Merge "Cleanup unreadable variable names"
* commit '15c671a3b67c6dc9d7e644d2913a58acedf961d4':
2013-09-26 05:24:17 -07:00
Tadashi G. Takaoka
bad26b8d49 am 08870866: am d67db32b: Merge "Separate SuggestionStripLayoutHelper for readablity"
* commit '08870866cbc986f997120be222d704af7b30563c':
2013-09-26 05:24:15 -07:00
Ken Wakasa
87dfe42d54 am 4647c4c7: am 424a173d: Merge "Move additional_proximity_chars to the layout directory"
* commit '4647c4c78efef4d096c11b1a2424ef49813d6ded':
2013-09-26 05:24:12 -07:00
Jean Chalard
3ff43de98a am 9a28541e: am 1a50999e: Merge "Tell the text view we reset state on finish input"
* commit '9a28541e05abdb0d4a603274faaab9cc815581b2':
2013-09-26 05:24:10 -07:00
Jean Chalard
68fc2ce3e9 am 46b9bd06: am faa7fbfa: Merge "Fix two strict mode warnings."
* commit '46b9bd068ad896ba1ae8fc941c5ae172f8a520f8':
2013-09-26 05:24:07 -07:00
Ken Wakasa
9f68bc67f1 am f002debd: am 29432f84: Create a new directory for layout-related implementations
* commit 'f002debdfe46d561f5d846e4a9ad8d3f331d3540':
2013-09-26 05:24:05 -07:00
Jean Chalard
f7de9f2cee am fd2f09ae: am 8eb214d7: Merge "Fix dictionary pack preference order."
* commit 'fd2f09aee87ee344da9cabefd8381d56dd9e6df4':
2013-09-26 05:24:02 -07:00
Jean Chalard
05d562328a am b6822188: am ec9670ac: Merge "Rub some butter on dictionary list scrolling."
* commit 'b6822188fa07272d1f5db5112705824d8b0ec938':
2013-09-26 05:23:59 -07:00
Keisuke Kuroyanagi
76aff5f323 am 01d88100: am 2ebe2009: Merge "Make DicTraverseSession having suggest options."
* commit '01d8810007de3f9d3709a3566654b195b1749473':
2013-09-26 05:23:57 -07:00
Baligh Uddin
2a1a2a846f am 2d5e13ec: (-s ours) am b4b72d43: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '2d5e13ec31b2d1dfe9aca4c46aaad0dad10aba4b':
2013-09-26 05:23:54 -07:00
Baligh Uddin
69cd136e82 am d88f0502: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'd88f050242fbcb1aab15231bfedeb1e5e8779025':
  Import translations. DO NOT MERGE
2013-09-26 05:23:52 -07:00
Kurt Partridge
86923245f5 am ce1d432c: am 305509ed: Merge "Remove unused method"
* commit 'ce1d432c2dc0dbd13ab841948e6653ae0ec9931c':
2013-09-26 05:23:49 -07:00