aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am a0970042: Merge "[Rlog57a] include logUnit boundaries in output"Kurt Partridge2013-01-101-16/+58
|\ | | | | | | | | * commit 'a0970042642ef39c22149a896efe785ec1fcaf01': [Rlog57a] include logUnit boundaries in output
| * Merge "[Rlog57a] include logUnit boundaries in output"Kurt Partridge2013-01-101-16/+58
| |\
| | * [Rlog57a] include logUnit boundaries in outputKurt Partridge2013-01-091-16/+58
| | | | | | | | | | | | Change-Id: I4d1647b971b0e7a4cf1a96f341236f6ab1d2ab16
* | | am 700ce8df: Merge "[Rlog56] Buffer words before pushing out LogUnit"Kurt Partridge2013-01-103-55/+96
|\| | | | | | | | | | | | | | * commit '700ce8df07eb242ce93f4f5e3e0ceb78473938ab': [Rlog56] Buffer words before pushing out LogUnit
| * | Merge "[Rlog56] Buffer words before pushing out LogUnit"Kurt Partridge2013-01-103-55/+96
| |\|
| | * [Rlog56] Buffer words before pushing out LogUnitKurt Partridge2013-01-093-55/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, a logbuffer only held an n-gram. Data went in and out of it, FIFO, until privacy conditions were met (i.e. data not collected too frequently), and then an n-gram was saved. E.g., if n=2, and only 10% of data is collected, then 18 words went through the logbuffer before it captured the next 2 words. However, if a user then went back and edited the n-gram, these edits were not captured. This change changes the logbuffer size to temporarily hold data about words that are not recorded, so that if the user backs up over them, the edits to an n-gram that we do eventually capture are stored. If the example above, instead of a logbuffer holding 2 words, it holds 20. The system waits until all the words not needed for the n-gram have been gathered (i.e. the buffer is full), so the user has adequate time to edit, before shifting out the n-gram. The buffer is still flushed when the user closes the IME. See the comment for MainLogBuffer for an explanation. multi-project commit with I45317bc95eeb859adc1b35b24d0478f2df1a67f3 Change-Id: I4ffd95d08c6437dcf650d866ef9e24b6af512334
* | | am 4da2ed7a: Fix too thick gesture trail widthKen Wakasa2013-01-101-1/+2
|\| | | | | | | | | | | | | | * commit '4da2ed7a78c63284fa3869450a492ee7ae420ed9': Fix too thick gesture trail width
| * | Fix too thick gesture trail widthKen Wakasa2013-01-101-1/+2
| | | | | | | | | | | | Change-Id: If1b78183b24fa0029bc28e5f56a988372182903e
* | | am 2ef0d3bf: Merge "fix possible NPE in DebugSettings"satok2013-01-101-0/+3
|\| | | | | | | | | | | | | | * commit '2ef0d3bf8db57ebebcb1c10f5b378a36b33ba1eb': fix possible NPE in DebugSettings
| * | Merge "fix possible NPE in DebugSettings"satok2013-01-101-0/+3
| |\ \
| | * | fix possible NPE in DebugSettingssatok2013-01-101-0/+3
| | | | | | | | | | | | | | | | Change-Id: I44ec5bd3b2a00087603316f14d732164dbcf399f
* | | | am d9c7a6b9: Merge "Move a method to a utility class (C1)"Jean Chalard2013-01-102-12/+16
|\| | | | | | | | | | | | | | | | | | | * commit 'd9c7a6b9b32c52b773165f7e177b3511cdc21d2f': Move a method to a utility class (C1)
| * | | Merge "Move a method to a utility class (C1)"Jean Chalard2013-01-102-12/+16
| |\ \ \
| | * | | Move a method to a utility class (C1)Jean Chalard2013-01-092-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory change to fix bug 7969231 Change-Id: I44604ae75192a17b4e75a01f3e3d679d4901299e
* | | | | 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