aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 "Remove unused MoreKeysPanel argument from Controller interface"Tadashi G. Takaoka2014-03-044-17/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused MoreKeysPanel argument from Controller interface•••Bug: 13204690 Change-Id: Ife438e78d9bbbf796df20f95c2da7a4d50e5a035 Tadashi G. Takaoka2014-03-044-17/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add action key label/icon tests"Tadashi G. Takaoka2014-03-041-0/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add action key label/icon tests•••Bug: 13017434 Change-Id: Ib04b377f4f4f9081573ef341f15b4b444ce7260c Tadashi G. Takaoka2014-03-041-0/+167
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL120] Cleanup•••Remove useless arguments, local vars, make stuff private Change-Id: I7cc6c19e9c1703304d593e02be31eb9569cc7b4e Jean Chalard2014-03-042-40/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL119] Make fields private.•••Change-Id: Ia84d3e5a102e1056e3d7467be07df89390f17617 Jean Chalard2014-03-041-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL118] Factorize a method•••If we can't get the right locale from the subtype switcher, we should fallback in all cases. Change-Id: I46a53a67927a793d9d3592a996a5a4392a36c6ff Jean Chalard2014-03-041-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL117] Simplification•••Change-Id: Id4d4f30ecdc80dd59543f90fe2525f4bcc5afb9d Jean Chalard2014-03-041-12/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "[IL116] Inline a method"Jean Chalard2014-03-041-15/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL116] Inline a method•••Change-Id: I6af8f2bd6b4917f9b119ff78a0f299b2f6fb921e Jean Chalard2014-03-041-15/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "[IL115] Cleanup continues"Jean Chalard2014-03-041-28/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL115] Cleanup continues•••Bug: 8636060 Change-Id: I944b10ec9798eec57d986e1075ba348aa0892cae Jean Chalard2014-03-041-28/+25
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Separate flaky unit test from KeyboardLayoutSetTestsBase"Tadashi G. Takaoka2014-03-042-27/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate flaky unit test from KeyboardLayoutSetTestsBase•••Move the flaky unit test to KeyboardLayoutSetSubtypesCountTests. Bug: 13291370 Bug: 13017434 Change-Id: I2144be4cc6b8215b895c45f47a5190fdeaa806f9 Tadashi G. Takaoka2014-03-042-27/+69
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL114] Move a method to InputLogic•••Bug: 8636060 Change-Id: I0d8f93985ddc6e93ce9af0d92a8056620351a498 Jean Chalard2014-03-042-25/+31