Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge in master-release history after reset to master | 2014-03-04 | 0 | -0/+0 | |
|\ | |||||
| * | merge in master-release history after reset to master | 2014-03-03 | 0 | -0/+0 | |
| |\ | |||||
| | * | merge in master-release history after reset to master | 2014-03-01 | 0 | -0/+0 | |
| | |\ | |||||
| | | * | merge in master-release history after reset to master | 2014-02-27 | 0 | -0/+0 | |
| | | |\ | |||||
| | | | * | merge in master-release history after reset to master | 2014-02-26 | 0 | -0/+0 | |
| | | | |\ | |||||
| | | | | * | merge in master-release history after reset to master | 2014-02-26 | 0 | -0/+0 | |
| | | | | |\ | |||||
| | | | | | * | merge in master-release history after reset to master | 2014-02-25 | 0 | -0/+0 | |
| | | | | | |\ | |||||
| | | | | | | * | merge in master-release history after reset to master | 2014-02-24 | 0 | -0/+0 | |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in master-release history after reset to master | 2014-02-20 | 0 | -0/+0 | |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in master-release history after reset to master | 2014-02-19 | 0 | -0/+0 | |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in master-release history after reset to master | 2014-02-18 | 0 | -0/+0 | |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in master-release history after reset to master | 2014-02-17 | 0 | -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 | 2014-02-13 | 1 | -2/+4 | |
| | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-02-12 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-02-11 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-02-10 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-02-06 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-02-05 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-02-03 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-30 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-29 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-28 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-27 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-23 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-22 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-21 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-20 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-16 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-15 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-14 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-13 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | Fix an NPE.•••Bug: 12397228 Change-Id: I7632931f0685fc8f0558946be66025b2bb2b5a3d | 2014-01-10 | 2 | -3/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-09 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to master | 2014-01-08 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | Revert "Fix a race condition."•••This reverts commit 42e83c7f06a1683b27a11564aeb9f3999b10382f. Bug: 12434783 Change-Id: Id01b6d14906430b13e64f5fc4d7fb01572d0a960 | 2014-01-07 | 1 | -5/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove unused MoreKeysPanel argument from Controller interface" | 2014-03-04 | 4 | -17/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused MoreKeysPanel argument from Controller interface•••Bug: 13204690 Change-Id: Ife438e78d9bbbf796df20f95c2da7a4d50e5a035 | 2014-03-04 | 4 | -17/+12 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add action key label/icon tests" | 2014-03-04 | 1 | -0/+167 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add action key label/icon tests•••Bug: 13017434 Change-Id: Ib04b377f4f4f9081573ef341f15b4b444ce7260c | 2014-03-04 | 1 | -0/+167 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL120] Cleanup•••Remove useless arguments, local vars, make stuff private Change-Id: I7cc6c19e9c1703304d593e02be31eb9569cc7b4e | 2014-03-04 | 2 | -40/+23 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL119] Make fields private.•••Change-Id: Ia84d3e5a102e1056e3d7467be07df89390f17617 | 2014-03-04 | 1 | -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 | 2014-03-04 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL117] Simplification•••Change-Id: Id4d4f30ecdc80dd59543f90fe2525f4bcc5afb9d | 2014-03-04 | 1 | -12/+12 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "[IL116] Inline a method" | 2014-03-04 | 1 | -15/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL116] Inline a method•••Change-Id: I6af8f2bd6b4917f9b119ff78a0f299b2f6fb921e | 2014-03-04 | 1 | -15/+10 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "[IL115] Cleanup continues" | 2014-03-04 | 1 | -28/+25 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL115] Cleanup continues•••Bug: 8636060 Change-Id: I944b10ec9798eec57d986e1075ba348aa0892cae | 2014-03-04 | 1 | -28/+25 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Separate flaky unit test from KeyboardLayoutSetTestsBase" | 2014-03-04 | 2 | -27/+69 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate flaky unit test from KeyboardLayoutSetTestsBase•••Move the flaky unit test to KeyboardLayoutSetSubtypesCountTests. Bug: 13291370 Bug: 13017434 Change-Id: I2144be4cc6b8215b895c45f47a5190fdeaa806f9 | 2014-03-04 | 2 | -27/+69 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [IL114] Move a method to InputLogic•••Bug: 8636060 Change-Id: I0d8f93985ddc6e93ce9af0d92a8056620351a498 | 2014-03-04 | 2 | -25/+31 |