aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | am f01862c9: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f01862c933fe03dbd411a668629b3ea367102830':
| * | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia33edf3e502ec25303cc0dae104c955cd5cfa3fe
| | * | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-160-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | am 7faf750f: am 73779f76: Make readUnigramsAndBigramsBinary read linked-list ↵Yuichiro Hanada2012-09-201-1/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nodes. * commit '7faf750f4a0868afd2d0692a96794ccecb2ede28': Make readUnigramsAndBigramsBinary read linked-list nodes.
| * | | | | | | | | | | | | | | | | | | am 73779f76: Make readUnigramsAndBigramsBinary read linked-list nodes.Yuichiro Hanada2012-09-201-1/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73779f7631d41f16f89c62cae09a1b27d8189dc3': Make readUnigramsAndBigramsBinary read linked-list nodes.
| | * | | | | | | | | | | | | | | | | | Make readUnigramsAndBigramsBinary read linked-list nodes.Yuichiro Hanada2012-09-201-1/+12
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07ae036b0b06e71d7a18f2bf11e4692cd4213568
* | | | | | | | | | | | | | | | | | | am f1eb35c9: am 54717534: Merge "Add getTerminalPosition." into jb-mr1-devKen Wakasa2012-09-204-4/+163
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1eb35c9f0ef96da7921d612f3b433834641e126': Add getTerminalPosition.
| * | | | | | | | | | | | | | | | | | am 54717534: Merge "Add getTerminalPosition." into jb-mr1-devKen Wakasa2012-09-204-4/+163
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '54717534b1164c575a14a4a117284e72c6cd0ee0': Add getTerminalPosition.
| | * | | | | | | | | | | | | | | | | Merge "Add getTerminalPosition." into jb-mr1-devKen Wakasa2012-09-204-4/+163
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Add getTerminalPosition.Yuichiro Hanada2012-09-204-4/+163
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If04d779db23b1aea2cc12e5e9b8cecfcb35a5737
* | | | | | | | | | | | | | | | | | am 36c7b2d8: am 81d2e937: Merge "Fix stuck gesture floatin preview text" ↵Tadashi G. Takaoka2012-09-201-9/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '36c7b2d82cce5b5bb11c127b32fb57f0e8b9ca11': Fix stuck gesture floatin preview text
| * | | | | | | | | | | | | | | | | am 81d2e937: Merge "Fix stuck gesture floatin preview text" into jb-mr1-devTadashi G. Takaoka2012-09-201-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81d2e937722ccefce84619e208d6438aef0b7d02': Fix stuck gesture floatin preview text
| | * | | | | | | | | | | | | | | | Merge "Fix stuck gesture floatin preview text" into jb-mr1-devTadashi G. Takaoka2012-09-201-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fix stuck gesture floatin preview textTadashi G. Takaoka2012-09-201-9/+9
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7192483 Change-Id: Ic62253180446a625330966a114a6fabf74ab4ec8
* | | | | | | | | | | | | | | | | am b474b602: am 61dcaaf1: Use device independent parameter for gestureTadashi G. Takaoka2012-09-201-31/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b474b602160dbeaab5b69fa60e90e6fb62068ed5': Use device independent parameter for gesture
| * | | | | | | | | | | | | | | | am 61dcaaf1: Use device independent parameter for gestureTadashi G. Takaoka2012-09-201-31/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '61dcaaf17e4d1f9e941b961559a46823e6e25c99': Use device independent parameter for gesture
| | * | | | | | | | | | | | | | | Use device independent parameter for gestureTadashi G. Takaoka2012-09-201-31/+32
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea95992e4482108a498f14ec595f3eacc7d7fc4b
* | | | | | | | | | | | | | | | am faf62426: am 84c1bbd7: Merge "Move ↵Tadashi G. Takaoka2012-09-202-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PointerTracker.MIN_GESTURE_RECOGNITION_TIME to GestureStroke" into jb-mr1-dev * commit 'faf62426fda3d17aab070da9a0f0d3f35f33908b': Move PointerTracker.MIN_GESTURE_RECOGNITION_TIME to GestureStroke
| * | | | | | | | | | | | | | | am 84c1bbd7: Merge "Move PointerTracker.MIN_GESTURE_RECOGNITION_TIME to ↵Tadashi G. Takaoka2012-09-202-6/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GestureStroke" into jb-mr1-dev * commit '84c1bbd76d144c2d777952079b9e8d8fea98c9b2': Move PointerTracker.MIN_GESTURE_RECOGNITION_TIME to GestureStroke
| | * | | | | | | | | | | | | | Merge "Move PointerTracker.MIN_GESTURE_RECOGNITION_TIME to GestureStroke" ↵Tadashi G. Takaoka2012-09-202-6/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| | | * | | | | | | | | | | | | Move PointerTracker.MIN_GESTURE_RECOGNITION_TIME to GestureStrokeTadashi G. Takaoka2012-09-202-6/+11
| | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib50192ed8f611fd8288ff9b7a1e0a19249cc6348
* | | | | | | | | | | | | | | am e3cfa38e: am 49d080f0: Merge "Auto correct on gesture when typed word is ↵Jean Chalard2012-09-201-1/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 char long" into jb-mr1-dev * commit 'e3cfa38eef62c31b15a61e58ce29a67204f8082f': Auto correct on gesture when typed word is 1 char long
| * | | | | | | | | | | | | | am 49d080f0: Merge "Auto correct on gesture when typed word is 1 char long" ↵Jean Chalard2012-09-201-1/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '49d080f088a82e18a2e0f6095e7443e7b837f714': Auto correct on gesture when typed word is 1 char long
| | * | | | | | | | | | | | | Merge "Auto correct on gesture when typed word is 1 char long" into jb-mr1-devJean Chalard2012-09-201-1/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Auto correct on gesture when typed word is 1 char longJean Chalard2012-09-201-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7178462 Change-Id: I779d8ee4a957a9d1fdcc80d33257a98965dec7b8
* | | | | | | | | | | | | | | am 84d6a942: (-s ours) am 430eed6d: am f5becbcd: (-s ours) am f1e13f1f: DO ↵satok2012-09-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE: Clear cache of the user dictionary when a word is added * commit '84d6a94207035d5ea705ed6be0c347a7e6ebd789': DO NOT MERGE: Clear cache of the user dictionary when a word is added
| * | | | | | | | | | | | | | am 430eed6d: am f5becbcd: (-s ours) am f1e13f1f: DO NOT MERGE: Clear cache ↵satok2012-09-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the user dictionary when a word is added * commit '430eed6daef111a6d37184ed55b1e196fbb902f9': DO NOT MERGE: Clear cache of the user dictionary when a word is added
| | * | | | | | | | | | | | | am f5becbcd: (-s ours) am f1e13f1f: DO NOT MERGE: Clear cache of the user ↵satok2012-09-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary when a word is added * commit 'f5becbcd758f6310658c4e08530eb55a697dc0d4': DO NOT MERGE: Clear cache of the user dictionary when a word is added
| | | * | | | | | | | | | | am f1e13f1f: DO NOT MERGE: Clear cache of the user dictionary when a word is ↵satok2012-09-191-0/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added * commit 'f1e13f1fb10db4152b2617093d827c66615ee16d': DO NOT MERGE: Clear cache of the user dictionary when a word is added
| | | | * | | | | | | | | | DO NOT MERGE: Clear cache of the user dictionary when a word is addedsatok2012-09-201-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of Iec2793de3fff7bf15f68f Change-Id: If16d1c48edf084d892da722fb288e467f211b08e
* | | | | | | | | | | | | | am c16c8c75: am a0ac9cc4: Merge "Use normal font for Hindi keyboard" into ↵Tadashi G. Takaoka2012-09-203-61/+122
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'c16c8c755f1f51840a0827f2f51a6a86a1f52645': Use normal font for Hindi keyboard
| * | | | | | | | | | | | | am a0ac9cc4: Merge "Use normal font for Hindi keyboard" into jb-mr1-devTadashi G. Takaoka2012-09-203-61/+122
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0ac9cc44713f8be8982baaf621399578e3af9cf': Use normal font for Hindi keyboard
| | * | | | | | | | | | | | Merge "Use normal font for Hindi keyboard" into jb-mr1-devTadashi G. Takaoka2012-09-193-61/+122
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Use normal font for Hindi keyboardTadashi G. Takaoka2012-09-203-61/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6753168 Change-Id: I731a56bce70e1881e176392acfe977de28696063
* | | | | | | | | | | | | | | am 8d1967b1: am 511218a5: Merge "Refine gesture point duration calcuation to ↵Tom Ouyang2012-09-201-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be more localized" into jb-mr1-dev * commit '8d1967b1b5beff39659b88cecb5dafa7bda2792e': Refine gesture point duration calcuation to be more localized
| * | | | | | | | | | | | | | am 511218a5: Merge "Refine gesture point duration calcuation to be more ↵Tom Ouyang2012-09-201-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | localized" into jb-mr1-dev * commit '511218a52baa678829ba71b21b8c6750dddf8b1e': Refine gesture point duration calcuation to be more localized
| | * | | | | | | | | | | | | Merge "Refine gesture point duration calcuation to be more localized" into ↵Tom Ouyang2012-09-191-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| | | * | | | | | | | | | | | Refine gesture point duration calcuation to be more localizedTom Ouyang2012-09-191-2/+2
| | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7165929 Change-Id: I3bb1c2622338023626fe4a879e43a86ac8fd0707
* | | | | | | | | | | | | | am d839242c: am bfcd2b3f: Merge "Change to "Show language switch key" ↵Tadashi G. Takaoka2012-09-204-23/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option" into jb-mr1-dev * commit 'd839242c95b6f251a005c07bdc179c6647906e9a': Change to "Show language switch key" option
| * | | | | | | | | | | | | am bfcd2b3f: Merge "Change to "Show language switch key" option" into jb-mr1-devTadashi G. Takaoka2012-09-204-23/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfcd2b3fc0ae7269396d4f694827928630b89d59': Change to "Show language switch key" option
| | * | | | | | | | | | | | Merge "Change to "Show language switch key" option" into jb-mr1-devTadashi G. Takaoka2012-09-194-23/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Change to "Show language switch key" optionTadashi G. Takaoka2012-09-204-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change deprecates "Suppress language switch key". Bug: 7037410 Change-Id: I1bc90877b4d2ee9364728959fd680dcb5b22ecbf
* | | | | | | | | | | | | | am 854c00dc: am f1ee5648: Smaller gesture preview trailTadashi G. Takaoka2012-09-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '854c00dcbb3fc529f30c2b2127b0bcc2bf5db580': Smaller gesture preview trail
| * | | | | | | | | | | | | am f1ee5648: Smaller gesture preview trailTadashi G. Takaoka2012-09-201-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1ee5648979959fca82b51f60ecb0273729a178a': Smaller gesture preview trail
| | * | | | | | | | | | | | Smaller gesture preview trailTadashi G. Takaoka2012-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7195987 Change-Id: Ibcd4b7a00b4e89070c4dfad88bb39ac1f7e4bd9a