aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in master-release history after reset to masterThe Android Automerger2014-03-110-0/+0
|\
| * merge in master-release history after reset to masterThe Android Automerger2014-03-100-0/+0
| |\
| | * merge in master-release history after reset to masterThe Android Automerger2014-03-090-0/+0
| | |\
| | | * merge in master-release history after reset to masterThe Android Automerger2014-03-080-0/+0
| | | |\
| | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-060-0/+0
| | | | |\
| | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-050-0/+0
| | | | | |\
| | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-040-0/+0
| | | | | | |\
| | | | | | | * 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup private method names"Tadashi G. Takaoka2014-03-111-15/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup private method names•••This is a follow up of Ib0ded6f98a. Change-Id: I91ad3504d301113680194ad5b10913fc86006150 Tadashi G. Takaoka2014-03-111-15/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix Greek tablet layout aligned with phone layout"Tadashi G. Takaoka2014-03-115-75/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Greek tablet layout aligned with phone layout•••Bug: 13406008 Change-Id: Iba5bd757c5874e426d5d4fcb8c404c21d259b833 Tadashi G. Takaoka2014-03-115-75/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add keyboard layout name constant"Tadashi G. Takaoka2014-03-112-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add keyboard layout name constant•••Change-Id: I6cdc3efdb58e7a1efb3e352d80d0aa41e333a150 Tadashi G. Takaoka2014-03-112-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Stop new BigramDictionary."Keisuke Kuroyanagi2014-03-112-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop new BigramDictionary.•••BigramDictionary is allocated inside of Dictionary. Change-Id: If224b4c408403f43eb3d2e292c0e0ecb86429290 Keisuke Kuroyanagi2014-03-102-5/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use emplace_back in getWordProperty()."Keisuke Kuroyanagi2014-03-112-12/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \