aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 43529369: am 8123913b: am cf5fc1ea: am 4e1f1689: am 5ae05786: Merge "Fix ↵Tadashi G. Takaoka2014-10-280-0/+0
|\ | | | | | | | | | | drawing of custom action label key" into lmp-dev * commit '43529369dde3fa1d2a8011ee0938c817ff64117f':
| * am 8123913b: am cf5fc1ea: am 4e1f1689: am 5ae05786: Merge "Fix drawing of ↵Tadashi G. Takaoka2014-10-280-0/+0
| |\ | | | | | | | | | | | | | | | custom action label key" into lmp-dev * commit '8123913b69f5eff419ec854223321cf37e7544e7':
| | * am cf5fc1ea: am 4e1f1689: am 5ae05786: Merge "Fix drawing of custom action ↵Tadashi G. Takaoka2014-10-270-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | label key" into lmp-dev * commit 'cf5fc1ea065873cd6d7b1d5d467940e4e45354d3':
* | | | am c581fb2e: (-s ours) am b2c1b3a1: (-s ours) am 1f76ef0e: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 6e0e130e: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c581fb2ec81e5bdf7ede9c8c34b55e7282cc5e75':
| * | | am b2c1b3a1: (-s ours) am 1f76ef0e: (-s ours) am 6e0e130e: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b2c1b3a19032acf933826a8f7344ddcaf62ad564':
| | * | am 1f76ef0e: (-s ours) am 6e0e130e: (-s ours) am 81c1daa9: (-s ours) Merge ↵Baligh Uddin2014-10-270-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit '1f76ef0e71b7c86d6b6582e67152a72e91108356':
* | | | | am 17a51d6f: (-s ours) am fc223951: (-s ours) am 12e57c5a: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8ca040c: (-s ours) am b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '17a51d6fa708022bc334051522f7ff973c3b5aa5':
| * | | | am fc223951: (-s ours) am 12e57c5a: (-s ours) am b8ca040c: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'fc22395126777ebf8d3b0be905f8e85ea7d8598a':
| | * | | am 12e57c5a: (-s ours) am b8ca040c: (-s ours) am b979cd54: (-s ours) Merge ↵Baligh Uddin2014-10-270-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit '12e57c5a720ef3f22b690fc65e13dde67e271959':
* | | | | | am f8eeeda7: (-s ours) am 2bcdfbcd: (-s ours) am 891f997c: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5cec932: (-s ours) am aaddee70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f8eeeda7e939ad0aaf26c31bf17ce3ba9063e1d3':
| * | | | | am 2bcdfbcd: (-s ours) am 891f997c: (-s ours) am f5cec932: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aaddee70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '2bcdfbcda73faf5b2bea9125a9349b2123baeff5':
| | * | | | am 891f997c: (-s ours) am f5cec932: (-s ours) am aaddee70: (-s ours) Merge ↵Baligh Uddin2014-10-270-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit '891f997c908ac26373aa0eee213bc93598c29d7b':
* | | | | | | am 8b31e2e9: (-s ours) am 0f64af2f: (-s ours) am fb6e234c: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adf64196: (-s ours) am 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '8b31e2e959bc889784136d4e11576f98c2a2a578':
| * | | | | | am 0f64af2f: (-s ours) am fb6e234c: (-s ours) am adf64196: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0f64af2ffb27b325ea32ad4cf543573f90c5f8f3':
| | * | | | | am fb6e234c: (-s ours) am adf64196: (-s ours) am 771a3a7d: (-s ours) Merge ↵Baligh Uddin2014-10-270-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit 'fb6e234c309cc520fc05439060ebce51805c5a19':
* | | | | | | | am 7d13bcfd: (-s ours) am 137e26ca: (-s ours) am 1bddfbba: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 923950d1: (-s ours) am d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7d13bcfde8b335661ad595f4033ab9f27d07160d':
| * | | | | | | am 137e26ca: (-s ours) am 1bddfbba: (-s ours) am 923950d1: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '137e26cae5ba414539d13587b388c0e17e0c54e2':
| | * | | | | | am 1bddfbba: (-s ours) am 923950d1: (-s ours) am d5937725: (-s ours) Merge ↵Baligh Uddin2014-10-270-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit '1bddfbbaa79960c353a6115f18105e5ef697d0fa':
* | | | | | | | | am aa5a348c: (-s ours) am 6f698156: (-s ours) am ee63d2f1: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e3f5ce1: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'aa5a348ccb20948f8afa326813e262adc6850e10':
| * | | | | | | | am 6f698156: (-s ours) am ee63d2f1: (-s ours) am 8e3f5ce1: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6f69815617697fc8e11f903c2e3fb9a359616cd0':
| | * | | | | | | am ee63d2f1: (-s ours) am 8e3f5ce1: (-s ours) am 73cbb981: (-s ours) Merge ↵Baligh Uddin2014-10-270-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit 'ee63d2f184c688e3be6305e376842aff495911a7':
* | | | | | | | | | am d752ce1b: (-s ours) am 7aab2e08: (-s ours) am 4fff69df: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1cdeef0: (-s ours) am 9dafca38: (-s ours) Import translations. DO NOT MERGE * commit 'd752ce1b19e8009ee2972c76237c81599e84232f':
| * | | | | | | | | am 7aab2e08: (-s ours) am 4fff69df: (-s ours) am b1cdeef0: (-s ours) am ↵Baligh Uddin2014-10-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dafca38: (-s ours) Import translations. DO NOT MERGE * commit '7aab2e0893f786715b645f417168cd2317b41fa4':
| | * | | | | | | | am 4fff69df: (-s ours) am b1cdeef0: (-s ours) am 9dafca38: (-s ours) Import ↵Baligh Uddin2014-10-270-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '4fff69df71c6d68184d8a066f0b9c0b4a1283018':
* | | | | | | | | | | am 450c8e89: Merge "Add some gesture-move tests"Jean Chalard2014-10-281-2/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '450c8e8935c35b93ab7c8183931313cb9acfb3a6': Add some gesture-move tests
| * | | | | | | | | | Merge "Add some gesture-move tests"Jean Chalard2014-10-281-2/+32
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add some gesture-move testsJean Chalard2014-10-281-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ec9a9169b0d27da93194e1bd3fa90da8174ee8f
* | | | | | | | | | | | am 395009c0: Fix NPE in AppearanceSettingsFragmentTadashi G. Takaoka2014-10-286-20/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '395009c03eeda42b2b2114d005c3ed8d7e4bfd4b': Fix NPE in AppearanceSettingsFragment
| * | | | | | | | | | | Fix NPE in AppearanceSettingsFragmentTadashi G. Takaoka2014-10-286-20/+24
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18147440 Change-Id: I7a7a47b3484e54146d34d11b5bd9c1305421d829
* | | | | | | | | | | am d5455fea: Merge "Add null analysis annotation to CollectionUtils"Tadashi G. Takaoka2014-10-272-6/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd5455fea4ad710e4b31890affe8efab948fe586e': Add null analysis annotation to CollectionUtils
| * | | | | | | | | | Merge "Add null analysis annotation to CollectionUtils"Tadashi G. Takaoka2014-10-272-6/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add null analysis annotation to CollectionUtilsTadashi G. Takaoka2014-10-272-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a610b037d6d1431cced3ea193171108bd5a040d
* | | | | | | | | | | | am f6a63710: Refactor CoordinateUtilsTadashi G. Takaoka2014-10-271-16/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6a637109636f39fbcf932bab1709ff247690da8': Refactor CoordinateUtils
| * | | | | | | | | | | Refactor CoordinateUtilsTadashi G. Takaoka2014-10-271-16/+19
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I607b803273a4d7983e9e25a81b6941a3b59194c6
* | | | | | | | | | | am 5547b49b: Merge "Remove device checking of Emoji physical key"Tadashi G. Takaoka2014-10-2712-58/+117
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5547b49b17572bfeaba90bf4e85e505182720a29': Remove device checking of Emoji physical key
| * | | | | | | | | | Merge "Remove device checking of Emoji physical key"Tadashi G. Takaoka2014-10-2712-58/+117
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove device checking of Emoji physical keyTadashi G. Takaoka2014-10-2712-58/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL also adds a settings option to enable/disable an Emoji-ALT physical key. Bug: 18122464 Change-Id: Iee1d97efec979a902b0492071d5e511ca1792ff0
* | | | | | | | | | | | am 23e07c97: Merge "Fix: deleted PtNode handling in v403."Keisuke Kuroyanagi2014-10-272-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23e07c971b9c83607a7ac67b0ad56b6e03ed1535': Fix: deleted PtNode handling in v403.
| * | | | | | | | | | | Merge "Fix: deleted PtNode handling in v403."Keisuke Kuroyanagi2014-10-272-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix: deleted PtNode handling in v403.Keisuke Kuroyanagi2014-10-272-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a word is once deleted, the word never gets into the personalized dictionaries due to this bug. Change-Id: Ife4e3fe1ba0615b4135e6291d2151b0db7d3f940
* | | | | | | | | | | | am 53b01038: Remove an unused importKen Wakasa2014-10-241-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '53b010384e7e883b532d3f65a5e90a0889d315e0': Remove an unused import
| * | | | | | | | | | | Remove an unused importKen Wakasa2014-10-241-1/+0
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to I2b81450f99d7b4493ba0fc5e502f4333b8db48cd Change-Id: I3d106db076e8181b65ce6843b801d12c6ca0adb1
* | | | | | | | | | | am 23a357d7: Small cleanupKen Wakasa2014-10-242-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23a357d71d5d1a404975375fd376618a4fd2a596': Small cleanup
| * | | | | | | | | | Small cleanupKen Wakasa2014-10-242-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b81450f99d7b4493ba0fc5e502f4333b8db48cd
* | | | | | | | | | | am dd5737b0: Merge "Fix unit test breakage"Tadashi G. Takaoka2014-10-244-9/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd5737b0fa3bf68f90534457ed8d23437caf5420': Fix unit test breakage
| * | | | | | | | | | Merge "Fix unit test breakage"Tadashi G. Takaoka2014-10-244-9/+14
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix unit test breakageTadashi G. Takaoka2014-10-244-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I538288054a58eb2c81ce3cbe5c9bef900fb653a5
* | | | | | | | | | | | am 9afac331: Merge "Add tests for type through recorrection"Jean Chalard2014-10-242-31/+95
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9afac3319c09f3daa626a403927a89c6ec25d3b8': Add tests for type through recorrection
| * | | | | | | | | | | Merge "Add tests for type through recorrection"Jean Chalard2014-10-242-31/+95
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add tests for type through recorrectionJean Chalard2014-10-222-31/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also introduce some helper methods Change-Id: I0f99733a4b7f0318b2b07217b614c19ea98859fc