Commit graph

19876 commits

Author SHA1 Message Date
Ken Wakasa
6ce09940f9 am 9147aa06: am e7726dea: am 23fe55d0: am 020a5704: am 496bb8af: am 11dc3a37: Clean up macro variables
* commit '9147aa066134edc5ec6f9720b4a276863b7ffdd0':
2013-10-03 16:12:24 -07:00
Kurt Partridge
990a9b3355 am 2953da4f: am a6c275c1: am e8be6f74: am 4865f818: am 0486b377: am 0dbae774: Merge "Avoid an NPE"
* commit '2953da4fa33862591b74e07e7f387821e2bf3bea':
2013-10-03 16:12:21 -07:00
Baligh Uddin
07b8386862 am 2159d77e: (-s ours) am 5a6bcbfb: (-s ours) am 3c6d5101: (-s ours) am 14a3c634: (-s ours) am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '2159d77e7fe01bd9d80b2bf37dc4aa3bbcebf0cc':
2013-10-03 16:12:19 -07:00
The Android Open Source Project
68b247d894 am d1938819: (-s ours) am d55e661e: am 3392102c: (-s ours) am 98691110: (-s ours) am 61adf619: (-s ours) am ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'd193881971ff57e2d883ada35ad7384ac845be57':
2013-10-03 16:12:17 -07:00
Tadashi G. Takaoka
d19697b011 am 599e9481: am 71159b59: am 3c3d8404: am 5834fbb9: am 15aab5b1: am cbc7acb6: Merge "Expand suggestion strip when center suggestion is long"
* commit '599e9481f0e40a5cb84b9938e1460c757a77c14c':
2013-10-03 16:12:14 -07:00
Kurt Partridge
e0a874f9b9 am 43d56da0: am 6e619633: am 28b85db8: am 4dfaaae8: am afbaac36: am 763fd9d5: Merge "Fix revert of committed words"
* commit '43d56da07f08e500e9994a4276b7b89879a0dc6a':
2013-10-03 16:12:12 -07:00
Ken Wakasa
eccd780e42 am 682edd51: am be181a22: am 8cc42f32: am 2f3ac8e8: am 3888cc24: am 156d3930: Remove a bunch macros that are no longer used
* commit '682edd51c196bde8aa790538bbe81d77ee96b204':
2013-10-03 16:12:09 -07:00
Satoshi Kataoka
bd05c5e772 am 728217a6: am cd42b44e: am b783f3b0: am 1b09a3f3: am b593ec88: am db0aa747: Merge "Purge WordsPriorityQueue"
* commit '728217a6e1a26af320cc3e47feaf68afa2967e65':
2013-10-03 16:12:06 -07:00
Ken Wakasa
4f4ac50a3c am 0d3d4f4a: am 54415777: am 9ca395b7: am b5cda658: am 887b635d: am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
* commit '0d3d4f4a0fe8b65829b273de0bec585342099282':
2013-10-03 16:12:04 -07:00
Satoshi Kataoka
6b57cd1a07 am ef8e1ead: am 19ae94c7: am b0e02abb: am 130e1f95: am 31bd7b17: am cbb1ee48: Fix build
* commit 'ef8e1ead6e140136bb61c18cf516fd3de972cd80':
2013-10-03 16:12:01 -07:00
Tadashi G. Takaoka
1fa7277a94 am d15f772b: am a946ab7a: am ea632ca2: am f2beae9e: am adf68c58: am b4ae86f0: Merge "Rename methods for readability"
* commit 'd15f772bc086762cfecf083a38dc8b2753aa18e3':
2013-10-03 16:11:59 -07:00
Satoshi Kataoka
685776a7b8 am 2884dabe: am b6c875f6: am 8fae9707: am b65bee7a: am f4f547f0: am dceebee4: Purge UnigramDictionary
* commit '2884dabefe8341b592eef39cda47cf7e57b8622e':
2013-10-03 16:11:56 -07:00
Satoshi Kataoka
52776463b8 am 560efcc9: am 039cef26: am 62efdff2: am 6d811db7: am c8335703: am eb6a7c82: Merge "Migrate used functions in UnigramDicitonary"
* commit '560efcc9a409075cf9b8ac51ec571d60a6cd22ad':
2013-10-03 16:11:54 -07:00
Tadashi G. Takaoka
71e6182a54 am 98ee25da: am 75a13052: am 5935d961: am 9edecd76: am 3e543e27: am 2a529b85: Merge "Clear previous suggestions when gesture typing starts"
* commit '98ee25dac12fec65b8b0566ed5b289fa0f35a6f3':
2013-10-03 16:11:52 -07:00
Satoshi Kataoka
445183d2bc am 6141f237: am 4b4edf8f: am 436a6c49: am 33bb4fa5: am b7974e8c: am d858b581: Move obsolete files to obsolete dir 2
* commit '6141f237bf2596686a5ed09313b2a8ca42d51809':
2013-10-03 16:11:49 -07:00
Satoshi Kataoka
bf13266353 am d5ba7513: am d13a713a: am b6d60e29: am e82cfe1f: am 9b5d603e: am e0bbb98d: Fix build
* commit 'd5ba7513cc4966e683b853d63dd44b32f8b36e2c':
2013-10-03 16:11:47 -07:00
Satoshi Kataoka
27c4787729 am 0047bea0: am b6efea52: am 75647fb9: am cdf85ea5: am b4379f9c: am 01cae939: Move obsolete files to obsolete dir
* commit '0047bea08cd61f6f7707c41a7aa0c53bf9ff9f07':
2013-10-03 16:11:46 -07:00
Jean Chalard
8c35265a23 am 014b05f3: am 7f6ee228: am 8d30f473: am f1f39730: am 994b2858: am 3b94fd7b: Merge "Update dictionaries"
* commit '014b05f33d34706be6751cdb7e785028e5444b74':
2013-10-03 16:11:43 -07:00
Satoshi Kataoka
e5d5825448 am a7ecf8c3: am 10876211: am 8397dbe6: am a4fa2681: am 26ae9aa8: am 7c92b421: Purge DicTraverseWrapper
* commit 'a7ecf8c31eb7b814d81d5ce2aa2639b99ab40914':
2013-10-03 16:11:40 -07:00
Tadashi G. Takaoka
68966f90f7 am ddc57756: am f952acee: am 79aca608: am 4eb8117d: am c6b7cd35: am 0e66ab74: Merge "Fix ArrayIndexOutOfBoundException"
* commit 'ddc57756a1a201e46c173ed578d2dd0adf10dc65':
2013-10-03 16:11:38 -07:00
Kurt Partridge
d85afb5735 am a2b94101: am a6b1c601: am 26afe795: am 15f3de26: am 420532cc: am c4119c80: Merge "Uncommit an extra LogUnit"
* commit 'a2b94101e7d1635d21361278289384f38c16928a':
2013-10-03 16:11:35 -07:00
Satoshi Kataoka
e586baf732 am 36cfd857: am c613917f: am db10c9a5: am 52831bac: am b13b977d: am d1811204: Move bigram_dictionary
* commit '36cfd857dd9c517bb9b6bb70960b904cd06a7d67':
2013-10-03 16:11:33 -07:00
Ken Wakasa
50616095cc am ee119b18: am d1042932: am 8ab03f1f: am aa512f24: am 67942c48: am 0bf8c0bf: Merge "Create "src/utils" directory"
* commit 'ee119b184ed8d980006758dcff09b74805f71db6':
2013-10-03 16:11:30 -07:00
Kurt Partridge
9130d28848 am 8690602b: am 1fb6e4a3: am 4d656472: am 9dcb846d: am ef827a99: am a2f3f17d: Merge "Compare scrubbed strings when uncommitting LogUnits"
* commit '8690602b5155719d8e710da59f2ff80b5e72ccbd':
2013-10-03 16:11:27 -07:00
Kurt Partridge
be5baa546b am ae37582d: am 3b77d996: am 389a4da0: am 41da00d3: am 173ac0c6: am 74330288: Merge "Uncommit separator LogUnits"
* commit 'ae37582d551fa151bc1917f73d2815694fc9e2f5':
2013-10-03 16:11:25 -07:00
Kurt Partridge
f084607690 am 7c943ec2: am cfe54354: am 25f302a1: am 84e4a9bf: am a856138c: am 3d209462: Merge "Uncommit LogUnits when reverting textInput"
* commit '7c943ec2f2327de4934719bdcef1bc97c0fb3499':
2013-10-03 16:11:23 -07:00
Kurt Partridge
724bf4c739 am 37f53939: am f2b30b6b: am 39eed879: am 4094dd7f: am 82d98e7a: am 4efb5c3b: Merge "Remove uncommit on reverting batch input"
* commit '37f5393913c1a5e394bdf6bbcb98aad77cf3aadc':
2013-10-03 16:11:21 -07:00
Ken Wakasa
aad63d0747 am 667e1f17: am 5b34dea0: am e34af095: am 1e1d2abd: am fe712a29: am f497e1e5: Move suggest_options.h to suggest/core
* commit '667e1f177230684f61636497f616b033de9b6738':
2013-10-03 16:11:18 -07:00
Keisuke Kuroyanagi
8d612c6522 am 66dc7e13: am 09b91a57: am 59bb6d0a: am 30de4e06: am 8ff5c03b: am 712fefd8: Merge "Use BinaryDictonaryInfo instead of raw pointers."
* commit '66dc7e13cc97218b322f36234d5eee9cd6d996b7':
2013-10-03 16:11:15 -07:00
Keisuke Kuroyanagi
5c935a1ec1 am 70cc03dc: am 96ca1fc9: am dc4b70b8: am c9fa8db0: am 12e2bd25: am 88ad30f4: Move dictionary format independent probability calculation methods to ProbabilityUtils.
* commit '70cc03dc7adc420b3b93f222ec6db00973f0b9a4':
2013-10-03 16:11:13 -07:00
Baligh Uddin
a7bb36b398 am 45eac3bc: (-s ours) am 66b22e90: (-s ours) am 0b57d3b7: (-s ours) am 7ea32c70: (-s ours) am 8c5fec2b: (-s ours) am d3ccd4bf: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '45eac3bc455f7051ce58d68a7267895ca270ce27':
2013-10-03 16:11:10 -07:00
Ken Wakasa
939dbccac7 am 249b21ca: am b509e43a: am 58c6f239: am e53f5b8a: am f80e2abb: am 1dae936f: Merge "Move char_utils to the dictionary directory"
* commit '249b21caf49c21aee4eb5ea499a78076d09236eb':
2013-10-03 16:11:07 -07:00
Jean Chalard
69fc3dcb1e am 36f1d947: am 348ae75c: am 767011c0: am a8f8dab6: am f6a4670d: am 26f48949: Fix the displayed status after download
* commit '36f1d94722fc21d2104e784116ab2be6ae522e68':
2013-10-03 16:11:05 -07:00
Jean Chalard
83e1750bbb am f3197a00: am 2aeea5fa: am 06cf0ee1: am cc9f726b: am fcdb85b3: am f61999ca: Merge "Make it easy to open several dictionaries from tests"
* commit 'f3197a00fd3e0d1a8a1aa2ab058c50fa45085325':
2013-10-03 16:11:02 -07:00
Tadashi G. Takaoka
723554323e am b5d9016a: am a79e3b0b: am d08fd780: am 063513c3: am 8a7acf14: am a0c3e02d: Refactor SuggestionStripLayoutHelper a bit
* commit 'b5d9016af81247ae180400d4f84d53d54d7d4527':
2013-10-03 16:11:00 -07:00
Tadashi G. Takaoka
7f356aa7cf am f0f9b435: am b17b38cf: am e2ee9001: am 27615a0c: am 0ef1e623: am 70c2dcff: am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
* commit 'f0f9b4359a0067ec65c2d0b08eedf14a0acec243':
2013-10-03 16:10:58 -07:00
Baligh Uddin
a2203621e5 am eac8bbb7: (-s ours) am e7e17d9e: (-s ours) am bdc3cf91: (-s ours) am abcb3246: (-s ours) am 1ba68664: (-s ours) am 5989c9b8: (-s ours) am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE
* commit 'eac8bbb7302ad83fb3c9933b6d07dd6b5a14fc06':
2013-10-03 16:10:55 -07:00
Tadashi G. Takaoka
ea262359e0 am d3400b3a: am 300d8d47: am 78beaed8: am 88688eb5: am 015d542f: am 723391c9: Merge "Tidy up Utils class a bit"
* commit 'd3400b3a77f1a6b07c113828ec2ab32e4c115785':
2013-10-03 16:10:53 -07:00
Keisuke Kuroyanagi
263caa3049 am 9765568b: am 23286afe: am 3e51de18: am c1863812: am 68d17aea: am f88f9dbb: Move "#define LOG_TAG" before include defines.h.
* commit '9765568ba2abdd4dc75b6b183f2258f24c0dc23b':
2013-10-03 16:10:50 -07:00
Kurt Partridge
728fa1a5f3 am fd6ea56b: am 98a3246f: am 9b2d28f6: am 3b03696f: am 502ff085: am e6125db9: Merge "Catch a permission exception"
* commit 'fd6ea56b0f8c3493b3b3a8565b798802f231d8c9':
2013-10-03 16:10:48 -07:00
Ken Wakasa
ae0405792d am 15cf9800: am 80a47804: am aee6d012: am fc027445: am e203961d: am a65c267b: Move some dictionary related implementations to the dictionary directory
* commit '15cf9800df45cd022e2e43f13498f6d6e91fa803':
2013-10-03 16:10:45 -07:00
Tadashi G. Takaoka
e9aacd3581 am 7fd6e061: am 9760d4fb: am d2d53125: am 18e322a5: am 15c671a3: am 7097aa2d: Merge "Cleanup unreadable variable names"
* commit '7fd6e061d91289647b0f3900c75199925771c425':
2013-10-03 16:10:42 -07:00
Tadashi G. Takaoka
bc3d1b1bb0 am 57f2b5d7: am 258d6d4d: am 759ed6ae: am bad26b8d: am 08870866: am d67db32b: Merge "Separate SuggestionStripLayoutHelper for readablity"
* commit '57f2b5d7f9490ae26230a1efa79d16542aaf00eb':
2013-10-03 16:10:40 -07:00
Ken Wakasa
7c246ad9ed am 5fc7bd13: am 877d5309: am 9a139fe3: am 87dfe42d: am 4647c4c7: am 424a173d: Merge "Move additional_proximity_chars to the layout directory"
* commit '5fc7bd13f87fc22e49e13544ce0c75da0a4cbd34':
2013-10-03 16:10:37 -07:00
Jean Chalard
f0a1ec7338 am 3bada9db: am 7f96c3ea: am 646b0df1: am 3ff43de9: am 9a28541e: am 1a50999e: Merge "Tell the text view we reset state on finish input"
* commit '3bada9dbaa54773e537fa97eb5dad1053c345c4b':
2013-10-03 16:10:35 -07:00
Jean Chalard
b4d0692b96 am 8f7d2afa: am 7b06c31b: am 0785ad5e: am 68fc2ce3: am 46b9bd06: am faa7fbfa: Merge "Fix two strict mode warnings."
* commit '8f7d2afa71065baf840c3d335924589f21c8e0df':
2013-10-03 16:10:32 -07:00
Ken Wakasa
107341d1b5 am 391cb168: am bc6e29c2: am ef6a5f3d: am 9f68bc67: am f002debd: am 29432f84: Create a new directory for layout-related implementations
* commit '391cb168cc5cdcbdc8ec62d1d1797b7947d3de40':
2013-10-03 16:10:29 -07:00
Jean Chalard
fda3c9e7c4 am 76e8e461: am 02415d5d: am 05605d04: am f7de9f2c: am fd2f09ae: am 8eb214d7: Merge "Fix dictionary pack preference order."
* commit '76e8e461f705b2e7bf649e7f74f641866d9258e8':
2013-10-03 16:10:28 -07:00
Jean Chalard
04865b196d am 90e1abe5: am 16a556ce: am 569affeb: am 05d56232: am b6822188: am ec9670ac: Merge "Rub some butter on dictionary list scrolling."
* commit '90e1abe55c3e2318d7da95e96ca4ede0d24fa44e':
2013-10-03 16:10:26 -07:00
Keisuke Kuroyanagi
1d826c87a2 am d51e9c4d: am e1633532: am a49f1750: am 76aff5f3: am 01d88100: am 2ebe2009: Merge "Make DicTraverseSession having suggest options."
* commit 'd51e9c4ddf8ce20dd0178316b36e983b891a9653':
2013-10-03 16:10:23 -07:00