aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f3197a00: am 2aeea5fa: am 06cf0ee1: am cc9f726b: am fcdb85b3: am ↵Jean Chalard2013-10-030-0/+0
|\ | | | | | | | | | | f61999ca: Merge "Make it easy to open several dictionaries from tests" * commit 'f3197a00fd3e0d1a8a1aa2ab058c50fa45085325':
| * am 2aeea5fa: am 06cf0ee1: am cc9f726b: am fcdb85b3: am f61999ca: Merge "Make ↵Jean Chalard2013-10-030-0/+0
| |\ | | | | | | | | | | | | | | | it easy to open several dictionaries from tests" * commit '2aeea5fa55c4d9886eb9aa493690e44e1f4a082f':
| | * am 06cf0ee1: am cc9f726b: am fcdb85b3: am f61999ca: Merge "Make it easy to ↵Jean Chalard2013-10-030-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | open several dictionaries from tests" * commit '06cf0ee14979a92ce4ee3c241ef984a508eefe8e':
| | | * 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 b5d9016a: am a79e3b0b: am d08fd780: am 063513c3: am 8a7acf14: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0c3e02d: Refactor SuggestionStripLayoutHelper a bit * commit 'b5d9016af81247ae180400d4f84d53d54d7d4527':
| * | | | am a79e3b0b: am d08fd780: am 063513c3: am 8a7acf14: am a0c3e02d: Refactor ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | SuggestionStripLayoutHelper a bit * commit 'a79e3b0b2abd8c152b70853700617dae2a05d0ab':
| | * | | am d08fd780: am 063513c3: am 8a7acf14: am a0c3e02d: Refactor ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | SuggestionStripLayoutHelper a bit * commit 'd08fd7803cb5b6a9156e89a930d4ec35619829a8':
| | | * | am 063513c3: am 8a7acf14: am a0c3e02d: Refactor SuggestionStripLayoutHelper ↵Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bit * commit '063513c3e4009c5027f204eefc254133f3693473':
* | | | | | am f0f9b435: am b17b38cf: am e2ee9001: am 27615a0c: am 0ef1e623: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70c2dcff: am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev * commit 'f0f9b4359a0067ec65c2d0b08eedf14a0acec243':
| * | | | | am b17b38cf: am e2ee9001: am 27615a0c: am 0ef1e623: am 70c2dcff: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev * commit 'b17b38cf2cd4bd0052244bb65eafd8eaad4881ab':
| | * | | | am e2ee9001: am 27615a0c: am 0ef1e623: am 70c2dcff: am 6f7e39a6: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev * commit 'e2ee90017a09b774484634958ba66d37836705aa':
| | | * | | 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 eac8bbb7: (-s ours) am e7e17d9e: (-s ours) am bdc3cf91: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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':
| * | | | | | am e7e17d9e: (-s ours) am bdc3cf91: (-s ours) am abcb3246: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ba68664: (-s ours) am 5989c9b8: (-s ours) am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE * commit 'e7e17d9eef0803306bd1a2155bb4ce6c89a2f818':
| | * | | | | am bdc3cf91: (-s ours) am abcb3246: (-s ours) am 1ba68664: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5989c9b8: (-s ours) am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE * commit 'bdc3cf91da596afa5e0ed10688da6fd18d20fe10':
| | | * | | | 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 d3400b3a: am 300d8d47: am 78beaed8: am 88688eb5: am 015d542f: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 723391c9: Merge "Tidy up Utils class a bit" * commit 'd3400b3a77f1a6b07c113828ec2ab32e4c115785':
| * | | | | | | am 300d8d47: am 78beaed8: am 88688eb5: am 015d542f: am 723391c9: Merge "Tidy ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up Utils class a bit" * commit '300d8d47873465e82e05d03ccf203ae18408720a':
| | * | | | | | am 78beaed8: am 88688eb5: am 015d542f: am 723391c9: Merge "Tidy up Utils ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class a bit" * commit '78beaed861fbd642c42da322ab10bfe3c3e3ea48':
| | | * | | | | am 88688eb5: am 015d542f: am 723391c9: Merge "Tidy up Utils class a bit"Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88688eb5009d4d3b7656ac6c4e2bd92d19aaf8bf':
* | | | | | | | | am 9765568b: am 23286afe: am 3e51de18: am c1863812: am 68d17aea: am ↵Keisuke Kuroyanagi2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f88f9dbb: Move "#define LOG_TAG" before include defines.h. * commit '9765568ba2abdd4dc75b6b183f2258f24c0dc23b':
| * | | | | | | | am 23286afe: am 3e51de18: am c1863812: am 68d17aea: am f88f9dbb: Move ↵Keisuke Kuroyanagi2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "#define LOG_TAG" before include defines.h. * commit '23286afe2176d531619efecf6ab833f6b30945af':
| | * | | | | | | am 3e51de18: am c1863812: am 68d17aea: am f88f9dbb: Move "#define LOG_TAG" ↵Keisuke Kuroyanagi2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before include defines.h. * commit '3e51de18180cd4a066d0a4fd106f04224eec925a':
| | | * | | | | | am c1863812: am 68d17aea: am f88f9dbb: Move "#define LOG_TAG" before include ↵Keisuke Kuroyanagi2013-09-260-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defines.h. * commit 'c18638123270f5038ce95f639087ddc1e999c408':
* | | | | | | | | | am fd6ea56b: am 98a3246f: am 9b2d28f6: am 3b03696f: am 502ff085: am ↵Kurt Partridge2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6125db9: Merge "Catch a permission exception" * commit 'fd6ea56b0f8c3493b3b3a8565b798802f231d8c9':
| * | | | | | | | | am 98a3246f: am 9b2d28f6: am 3b03696f: am 502ff085: am e6125db9: Merge ↵Kurt Partridge2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Catch a permission exception" * commit '98a3246f554a575e54757e5092cf1a3d928dbb31':
| | * | | | | | | | am 9b2d28f6: am 3b03696f: am 502ff085: am e6125db9: Merge "Catch a ↵Kurt Partridge2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission exception" * commit '9b2d28f6184b2a540dae4f79ca5ae44990a4ceed':
| | | * | | | | | | am 3b03696f: am 502ff085: am e6125db9: Merge "Catch a permission exception"Kurt Partridge2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b03696f928629c7c722cb55004a2745dc9301c0':
* | | | | | | | | | | am 15cf9800: am 80a47804: am aee6d012: am fc027445: am e203961d: am ↵Ken Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a65c267b: Move some dictionary related implementations to the dictionary directory * commit '15cf9800df45cd022e2e43f13498f6d6e91fa803':
| * | | | | | | | | | am 80a47804: am aee6d012: am fc027445: am e203961d: am a65c267b: Move some ↵Ken Wakasa2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary related implementations to the dictionary directory * commit '80a47804d4919cb888277ec03587def5197f2d21':
| | * | | | | | | | | am aee6d012: am fc027445: am e203961d: am a65c267b: Move some dictionary ↵Ken Wakasa2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related implementations to the dictionary directory * commit 'aee6d012754c4a32a0a7485bd4a51d2ccb053e0d':
| | | * | | | | | | | am fc027445: am e203961d: am a65c267b: Move some dictionary related ↵Ken Wakasa2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementations to the dictionary directory * commit 'fc027445cd68baa76e2983c1e9c442f06c84041e':
* | | | | | | | | | | | am 7fd6e061: am 9760d4fb: am d2d53125: am 18e322a5: am 15c671a3: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7097aa2d: Merge "Cleanup unreadable variable names" * commit '7fd6e061d91289647b0f3900c75199925771c425':
| * | | | | | | | | | | am 9760d4fb: am d2d53125: am 18e322a5: am 15c671a3: am 7097aa2d: Merge ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Cleanup unreadable variable names" * commit '9760d4fbc8024ca6f1bb955a743bf21ce40ea33c':
| | * | | | | | | | | | am d2d53125: am 18e322a5: am 15c671a3: am 7097aa2d: Merge "Cleanup ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unreadable variable names" * commit 'd2d53125d48abe7bf014013e4de53d91ff17b6f7':
| | | * | | | | | | | | am 18e322a5: am 15c671a3: am 7097aa2d: Merge "Cleanup unreadable variable names"Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18e322a5ddd449569716369b41917fde4602a167':
* | | | | | | | | | | | | am 57f2b5d7: am 258d6d4d: am 759ed6ae: am bad26b8d: am 08870866: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d67db32b: Merge "Separate SuggestionStripLayoutHelper for readablity" * commit '57f2b5d7f9490ae26230a1efa79d16542aaf00eb':
| * | | | | | | | | | | | am 258d6d4d: am 759ed6ae: am bad26b8d: am 08870866: am d67db32b: Merge ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Separate SuggestionStripLayoutHelper for readablity" * commit '258d6d4dee325434098e11873802df96b36f23b5':
| | * | | | | | | | | | | am 759ed6ae: am bad26b8d: am 08870866: am d67db32b: Merge "Separate ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SuggestionStripLayoutHelper for readablity" * commit '759ed6ae92b439fb231b3e71db37d4e0d6b07144':
| | | * | | | | | | | | | am bad26b8d: am 08870866: am d67db32b: Merge "Separate ↵Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SuggestionStripLayoutHelper for readablity" * commit 'bad26b8d498d087dbb65537deb73da13f75986c7':
* | | | | | | | | | | | | | am 5fc7bd13: am 877d5309: am 9a139fe3: am 87dfe42d: am 4647c4c7: am ↵Ken Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 424a173d: Merge "Move additional_proximity_chars to the layout directory" * commit '5fc7bd13f87fc22e49e13544ce0c75da0a4cbd34':
| * | | | | | | | | | | | | am 877d5309: am 9a139fe3: am 87dfe42d: am 4647c4c7: am 424a173d: Merge "Move ↵Ken Wakasa2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional_proximity_chars to the layout directory" * commit '877d530942d1edb7b08e166a6039a837a04986d3':
| | * | | | | | | | | | | | am 9a139fe3: am 87dfe42d: am 4647c4c7: am 424a173d: Merge "Move ↵Ken Wakasa2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional_proximity_chars to the layout directory" * commit '9a139fe3ef4b2f84bc8f7f2ede723e9ee4700f96':
| | | * | | | | | | | | | | am 87dfe42d: am 4647c4c7: am 424a173d: Merge "Move ↵Ken Wakasa2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional_proximity_chars to the layout directory" * commit '87dfe42d548237711b555ce35d7341d5435916af':
* | | | | | | | | | | | | | | am 3bada9db: am 7f96c3ea: am 646b0df1: am 3ff43de9: am 9a28541e: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a50999e: Merge "Tell the text view we reset state on finish input" * commit '3bada9dbaa54773e537fa97eb5dad1053c345c4b':
| * | | | | | | | | | | | | | am 7f96c3ea: am 646b0df1: am 3ff43de9: am 9a28541e: am 1a50999e: Merge "Tell ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the text view we reset state on finish input" * commit '7f96c3ea9233a70996fd4f58b88816bec4814cb5':
| | * | | | | | | | | | | | | am 646b0df1: am 3ff43de9: am 9a28541e: am 1a50999e: Merge "Tell the text ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | view we reset state on finish input" * commit '646b0df1f81f322c0bf7110e64529daac5dc7045':
| | | * | | | | | | | | | | | 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 8f7d2afa: am 7b06c31b: am 0785ad5e: am 68fc2ce3: am 46b9bd06: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faa7fbfa: Merge "Fix two strict mode warnings." * commit '8f7d2afa71065baf840c3d335924589f21c8e0df':
| * | | | | | | | | | | | | | | am 7b06c31b: am 0785ad5e: am 68fc2ce3: am 46b9bd06: am faa7fbfa: Merge "Fix ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two strict mode warnings." * commit '7b06c31b211ddfb7c57e0024c86006cd39917646':