aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in master-release history after reset to masterThe Android Automerger2014-03-030-0/+0
|\
| * merge in master-release history after reset to masterThe Android Automerger2014-03-010-0/+0
| |\
| | * merge in master-release history after reset to masterThe Android Automerger2014-02-270-0/+0
| | |\
| | | * merge in master-release history after reset to masterThe Android Automerger2014-02-260-0/+0
| | | |\
| | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-260-0/+0
| | | | |\
| | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-250-0/+0
| | | | | |\
| | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-240-0/+0
| | | | | | |\
| | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-200-0/+0
| | | | | | | |\
| | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-190-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-180-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-170-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * Fix a null object reference crash on Emoji Palette•••Do nothing if the current EmojiPageKeyboardView is null. BUG: 13006906 Change-Id: I169b70122ec939075b5be033953b48762fd528fc Conflicts: java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java Yohei Yukawa2014-02-131-2/+4
| | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-120-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-110-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-100-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-060-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-050-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-030-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-300-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-290-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-280-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-270-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-230-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix an NPE.•••Bug: 12397228 Change-Id: I7632931f0685fc8f0558946be66025b2bb2b5a3d Jean Chalard2014-01-102-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Fix a race condition."•••This reverts commit 42e83c7f06a1683b27a11564aeb9f3999b10382f. Bug: 12434783 Change-Id: Id01b6d14906430b13e64f5fc4d7fb01572d0a960 Victoria Lease2014-01-071-5/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional subtypes test•••Change-Id: I2994fd72bc284c84757f5a2bfa8045aa574a8fbc Tadashi G. Takaoka2014-03-032-0/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix unit test message to use 0-based index"Tadashi G. Takaoka2014-03-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unit test message to use 0-based index•••Change-Id: I2c91628d21dc96712f6cbea996f28f5d39fb402e Tadashi G. Takaoka2014-03-031-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I20ce61c4,I2edab4e3•••* changes: Remove "Use only personalization dictionary". Remove redundant creation of dictionary facilitator. Keisuke Kuroyanagi2014-03-037-51/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "Use only personalization dictionary".•••Bug: 13216198 Change-Id: I20ce61c4a10c360e028bf6427f632cc5299763e4 Keisuke Kuroyanagi2014-02-275-33/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant creation of dictionary facilitator.•••Change-Id: I2edab4e3ba4ea0b9b13f9bb224aac86cac9b9f31 Keisuke Kuroyanagi2014-02-273-23/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix: wrong auto correction for whilelist and personalized words."Keisuke Kuroyanagi2014-02-281-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: wrong auto correction for whilelist and personalized words.•••This happens when there are tailing single quotes. Bug: 13237314 Change-Id: I7fd2a20b25ac2217f9621d7f2510345bbd633c14 Keisuke Kuroyanagi2014-02-281-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add header attributes for evaluation.•••Bug: 13197276 Change-Id: Ib5247da691ff24a73e13485288237ccc51bb54f0 Keisuke Kuroyanagi2014-02-2810-48/+119
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix: dicttool build."Keisuke Kuroyanagi2014-02-281-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: dicttool build.•••Change-Id: I592b14eba895786d0981586a01ef545e003396c8 Keisuke Kuroyanagi2014-02-281-0/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use dynamic operations to construct all ver4 dicts."Keisuke Kuroyanagi2014-02-289-414/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use dynamic operations to construct all ver4 dicts.•••Bug: 8187060 Bug: 13127350 Change-Id: I081ee904c41898128efa8ba7a1bf3fa0a46c6231 Keisuke Kuroyanagi2014-02-279-414/+150
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Added a method and run GC for testing."Keisuke Kuroyanagi2014-02-285-14/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a method and run GC for testing.•••Bug: 13231889 Change-Id: If64b7422967c3e4107c845072b64a7bb26a35f7e Keisuke Kuroyanagi2014-02-285-14/+40
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing null checks for getOwnerInstance()•••It may just return null. Change-Id: I778fb48262ef8af28a4af50b70bb94ace75a488c Ken Wakasa2014-02-281-11/+33