aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 9c75ad1a: Merge "Fix international tests"Jean Chalard2013-01-101-0/+8
|\ | | | | | | | | * commit '9c75ad1adec6e7ce2f2b202795fc23e0a4ac5617': Fix international tests
| * Merge "Fix international tests"Jean Chalard2013-01-101-0/+8
| |\
| | * Fix international testsJean Chalard2013-01-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests have been broken again by recent changes to subtype choice within Latin IME. This fixes the problem and all tests pass again. This change also includes a small fix to one test that was checking for something irrelevant. Change-Id: I6a03dea24f99b0d2ad84c4161a8413f3060bb811
* | | am a80b8fc9: Merge "Show final suggested word when batch input is finished"Tadashi G. Takaoka2013-01-094-31/+22
|\| | | | | | | | | | | | | | * commit 'a80b8fc98f321920bc045bb5fd9952680d0e439e': Show final suggested word when batch input is finished
| * | Merge "Show final suggested word when batch input is finished"Tadashi G. Takaoka2013-01-094-31/+22
| |\ \
| | * | Show final suggested word when batch input is finishedTadashi G. Takaoka2013-01-104-31/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves dismiss timer of gesture floating preview text from PreviewPlacerView to KeyboardView. Bug: 7967461 Change-Id: I0ca5beddc93cb4bc4a405f914d217d37b997402b
* | | | am ae4c8199: Merge "Initial implementation for dead keys (B3)"Jean Chalard2013-01-094-0/+105
|\| | | | | | | | | | | | | | | | | | | * commit 'ae4c81993c201f501791520b8cd3697ff1f29649': Initial implementation for dead keys (B3)
| * | | Merge "Initial implementation for dead keys (B3)"Jean Chalard2013-01-094-0/+105
| |\ \ \
| | * | | Initial implementation for dead keys (B3)Jean Chalard2013-01-104-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5037589 Change-Id: I9e1ff92df7d0c58eb7a0f33603adebc9efb86585
* | | | | am 433f54ce: Merge "Remove unused variables"Tadashi G. Takaoka2013-01-092-20/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '433f54ce9079588cb5b5c4ba4a9fd1a9f3e17eff': Remove unused variables
| * | | | Merge "Remove unused variables"Tadashi G. Takaoka2013-01-092-20/+10
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove unused variablesTadashi G. Takaoka2013-01-102-20/+10
| | | |/ | | |/| | | | | | | | | Change-Id: I508679c2ad21b2624760d37a9503e21733964d4c
* | | | am 424d76fb: Merge "Add a next Event (B2)"Jean Chalard2013-01-093-22/+24
|\| | | | | | | | | | | | | | | | | | | * commit '424d76fbf59bea5f96694a31918568a7479b89be': Add a next Event (B2)
| * | | Merge "Add a next Event (B2)"Jean Chalard2013-01-093-22/+24
| |\ \ \
| | * | | Add a next Event (B2)Jean Chalard2013-01-093-22/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: If2fe6f0f4f88a6ae1f22664ded61cec6942c18b9
* | | | | am d8903f4b: Merge "Add words to Portuguese"Jean Chalard2013-01-091-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8903f4bf7e04ab5abc1c91bf81803e3629f3123': Add words to Portuguese
| * | | | Merge "Add words to Portuguese"Jean Chalard2013-01-091-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add words to PortugueseJean Chalard2013-01-101-0/+0
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | >>> dictionaries/pt_BR_wordlist.combined.gz Header : date : 1355802839 <=> 1357790917 version : 29 <=> 30 Body : Added: à 30 Added: é 30 Added: ò 30 Added: ô 30 >>> dictionaries/pt_PT_wordlist.combined.gz Header : date : 1355802856 <=> 1357790930 version : 29 <=> 30 Body : Added: à 30 Added: é 30 Added: ò 30 Added: ô 30 >>> java/res/raw/main_pt_br.dict Header : date : 1355802839 <=> 1357790917 version : 29 <=> 30 Body : Added: à 30 Added: é 30 Added: ò 30 Added: ô 30 Bug: 7966948 Change-Id: I71c0986cf616d67926d0a6a0e53099b04b0427d5
* | | | am 6512cd28: Merge "Cancel update batch input timer only when point is added"Tadashi G. Takaoka2013-01-092-8/+15
|\| | | | | | | | | | | | | | | | | | | * commit '6512cd289d4d6bcc835b9da013c3098bf3807bc2': Cancel update batch input timer only when point is added
| * | | Merge "Cancel update batch input timer only when point is added"Tadashi G. Takaoka2013-01-092-8/+15
| |\ \ \
| | * | | Cancel update batch input timer only when point is addedTadashi G. Takaoka2013-01-102-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7972004 Change-Id: Ie5db5910efba851976da2284cafc69be2910d354
* | | | | am 759506ef: Merge "[Rlog52z] Cleanup and small bug fixes"Kurt Partridge2013-01-092-9/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '759506ef2dad41bf53c65ff090e8f11275669cda': [Rlog52z] Cleanup and small bug fixes
| * | | | Merge "[Rlog52z] Cleanup and small bug fixes"Kurt Partridge2013-01-092-9/+10
| |\ \ \ \
| | * | | | [Rlog52z] Cleanup and small bug fixesKurt Partridge2013-01-092-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3fca4881370ffcdd5f2b14d2d1094c51f4330ae
* | | | | | am f11c4a9a: Merge "[Rlog50] capture bigrams properly even with deletions"Kurt Partridge2013-01-097-62/+191
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f11c4a9aeb9b08d6c0c29861c3d9832334834d90': [Rlog50] capture bigrams properly even with deletions
| * | | | | Merge "[Rlog50] capture bigrams properly even with deletions"Kurt Partridge2013-01-097-62/+191
| |\| | | | | | |_|/ / | |/| | |
| | * | | [Rlog50] capture bigrams properly even with deletionsKurt Partridge2013-01-097-62/+191
| | | |/ | | |/| | | | | | | | | | | | | | | | | multi-project commit with Ia4ec213e8356897807cb6a278fccdbaa945732f0 Change-Id: Ib3fe886dc889954a31586ab81d00a21d8d55efd2
* | | | am 95e3008d: Merge "Rename variables related to key preview popup"Tadashi G. Takaoka2013-01-091-13/+12
|\| | | | | | | | | | | | | | | | | | | * commit '95e3008d2503916a71cee322146d8a0097326000': Rename variables related to key preview popup
| * | | Merge "Rename variables related to key preview popup"Tadashi G. Takaoka2013-01-091-13/+12
| |\ \ \
| | * | | Rename variables related to key preview popupTadashi G. Takaoka2013-01-101-13/+12
| | | |/ | | |/| | | | | | | | | Change-Id: I0161e5844dd325af9afba80ac54a569b16c80660
* | | | am 6ece8f71: Merge "Remove unused variable"Tadashi G. Takaoka2013-01-091-3/+0
|\| | | | | | | | | | | | | | | | | | | * commit '6ece8f718b50e5bb847152dabe290982efd42df2': Remove unused variable
| * | | Merge "Remove unused variable"Tadashi G. Takaoka2013-01-091-3/+0
| |\ \ \
| | * | | Remove unused variableTadashi G. Takaoka2013-01-101-3/+0
| | |/ / | | | | | | | | | | | | Change-Id: I7001d8b6200a5cefcf84630d663da8316422026f
* | | | am 3727a3fd: Merge "Clean up public helper methods of SettingsValues"Tadashi G. Takaoka2013-01-099-211/+205
|\| | | | | | | | | | | | | | | | | | | * commit '3727a3fd6137c3552dc299f60b1f1df41cb47059': Clean up public helper methods of SettingsValues
| * | | Merge "Clean up public helper methods of SettingsValues"Tadashi G. Takaoka2013-01-099-211/+205
| |\ \ \ | | |/ / | |/| |
| | * | Clean up public helper methods of SettingsValuesTadashi G. Takaoka2013-01-099-211/+205
| | | | | | | | | | | | | | | | Change-Id: I6c6087580b67f497eaaf16900f8df7a4a895b8e3
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-01-095-7/+5
| | |/ | |/| | | | | | | | | | Change-Id: I7513684783ad97339184b8db61ddd062cbd7a1c5 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-01-095-7/+5
| | | | | | | | | | | | | | | Change-Id: I35be6cca9818f1ea08f3a23c76d19bfb945028b7 Auto-generated-cl: translation import
* | | am 125ad223: Merge "Abandon the idea of an Event pool and make Event ↵Jean Chalard2013-01-093-26/+17
|\| | | | | | | | | | | | | | | | | | | | immutable (B1)" * commit '125ad2237072745e4800b7a3907d5507024f35e5': Abandon the idea of an Event pool and make Event immutable (B1)
| * | Merge "Abandon the idea of an Event pool and make Event immutable (B1)"Jean Chalard2013-01-093-26/+17
| |\ \
| | * | Abandon the idea of an Event pool and make Event immutable (B1)Jean Chalard2013-01-093-26/+17
| | |/ | | | | | | | | | Change-Id: I750a07c0c564a95ceac734afa873ca3da9626a7f
* | | am b112a135: Merge "Fix a race condition with backspaces"Jean Chalard2013-01-091-0/+5
|\| | | | | | | | | | | | | | * commit 'b112a13518fd7479da4113d8e4f4f327ad8b9bbb': Fix a race condition with backspaces
| * | Merge "Fix a race condition with backspaces"Jean Chalard2013-01-091-0/+5
| |\ \
| | * | Fix a race condition with backspacesJean Chalard2013-01-091-0/+5
| | |/ | | | | | | | | | | | | | | | | | | And add a test to make sure it stays not-broken. Bug: 7946604 Change-Id: I996da3d5507d591ec25a13fb57434f39843f1df5
* | | am e56686f4: Merge "Cancel update batch input timer whenever MotionEvent is ↵Tadashi G. Takaoka2013-01-093-0/+24
|\| | | | | | | | | | | | | | | | | | | | received" * commit 'e56686f43af81db965941a393c5e0231c26ec77b': Cancel update batch input timer whenever MotionEvent is received
| * | Merge "Cancel update batch input timer whenever MotionEvent is received"Tadashi G. Takaoka2013-01-093-0/+24
| |\ \
| | * | Cancel update batch input timer whenever MotionEvent is receivedTadashi G. Takaoka2013-01-093-0/+24
| | |/ | | | | | | | | | | | | Bug: 7911739 Change-Id: Id2cd98385371fd98435943ed66ec5381dfaa48e0
* | | am 28772899: Merge "Don\'t cancel gesture typing while more keys keyboard is ↵Tadashi G. Takaoka2013-01-091-0/+5
|\| | | | | | | | | | | | | | | | | | | | shown" * commit '28772899d2fd0f452d1beca79c03123eaee53c0f': Don't cancel gesture typing while more keys keyboard is shown
| * | Don't cancel gesture typing while more keys keyboard is shownTadashi G. Takaoka2013-01-091-0/+5
| |/ | | | | | | | | Bug: 7964225 Change-Id: I4c572527b6f399282bdd963e38c147c7e69815ac
* | am 8315e816: Merge "Clean up debug related preference keys"Tadashi G. Takaoka2013-01-082-10/+10
|\| | | | | | | | | * commit '8315e8168b135599237f5493f72e667f39503006': Clean up debug related preference keys