aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4f430763: Fix a faulty testJean Chalard2013-04-101-1/+1
|\ | | | | | | | | * commit '4f43076370dd2fb6243f28ee932d6c593c49ee43': Fix a faulty test
| * Fix a faulty testJean Chalard2013-04-101-1/+1
| | | | | | | | Change-Id: I5c03cea41e9b6e936e8f93b7d756f0fc9520002d
* | am 99b93d17: Fix a bug where autocorrection status would be wrong.Jean Chalard2013-04-109-20/+41
|\| | | | | | | | | * commit '99b93d17d53c2d587c45373831b327f7851ec0a8': Fix a bug where autocorrection status would be wrong.
| * Fix a bug where autocorrection status would be wrong.Jean Chalard2013-04-109-20/+41
| | | | | | | | Change-Id: Ic220129dc59f585164dbf63591cd1c96de17fe6f
* | am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if existsTadashi G. Takaoka2013-04-101-1/+4
|\| | | | | | | | | * commit '262d5bd9f964d7fb18d96ec2ccf821b042aa3a3a': Don't override EXTRA_SHOW_FRAGMENT if exists
| * Don't override EXTRA_SHOW_FRAGMENT if existsTadashi G. Takaoka2013-04-101-1/+4
| | | | | | | | | | Bug: 8541190 Change-Id: I37d3de12558efd55f157389d2e0b51fc83dc5da1
* | am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"Tadashi G. Takaoka2013-04-095-9/+16
|\| | | | | | | | | * commit '10af4b6e45689cba9bdc8c22f1bb76bf8bd2516b': Separate StringUtils.capitalizeFirstCharacter
| * Merge "Separate StringUtils.capitalizeFirstCharacter"Tadashi G. Takaoka2013-04-105-9/+16
| |\
| | * Separate StringUtils.capitalizeFirstCharacterTadashi G. Takaoka2013-04-105-9/+16
| | | | | | | | | | | | | | | Bug: 8582061 Change-Id: Iac8f65defdd92d7df533bdf0e2937ad897d96363
* | | am 87fdde6e: Typing double letters via a \'circle\' on the key.Keisuke Kuroynagi2013-04-094-22/+33
|\| | | | | | | | | | | | | | * commit '87fdde6ec48844ddbb482c50fbda226c63ca5e85': Typing double letters via a 'circle' on the key.
| * | Typing double letters via a 'circle' on the key.Keisuke Kuroynagi2013-04-104-22/+33
| | | | | | | | | | | | | | | Bug: 8550980 Change-Id: I5e432dea0e025ccea196f80e90a6bf945488e130
* | | am f606fd85: Hide Setup Wizard icon for stock keyboardTadashi G. Takaoka2013-04-093-1/+34
|\| | | | | | | | | | | | | | * commit 'f606fd855425eba365c8dcc8463a61c4a77d6539': Hide Setup Wizard icon for stock keyboard
| * | Hide Setup Wizard icon for stock keyboardTadashi G. Takaoka2013-04-103-1/+34
| |/ | | | | | | | | Bug: 8581647 Change-Id: Id530f1a33a5c919f4a732ec0d545dfbe76e56316
* | am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ↵Tadashi G. Takaoka2013-04-093-56/+59
|\| | | | | | | | | | | | | ProximityInfo" * commit '4fdfce6dcc35310de9235cf9c529d0b17b5c2a8c': Refactor SpellCheckerProximityInfo as extending ProximityInfo
| * Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"Tadashi G. Takaoka2013-04-103-56/+59
| |\
| | * Refactor SpellCheckerProximityInfo as extending ProximityInfoTadashi G. Takaoka2013-04-023-56/+59
| | | | | | | | | | | | Change-Id: I544eec9d661796d57749dbaa2163bc1e2a891353
* | | am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"Tom Ouyang2013-04-096-6/+17
|\| | | | | | | | | | | | | | * commit '43779c04a9933bd1bcba3655b314485cc08bf2c2': Add method to get dictionary flags from DicTraverseSession
| * | Merge "Add method to get dictionary flags from DicTraverseSession"Tom Ouyang2013-04-096-6/+17
| |\ \
| | * | Add method to get dictionary flags from DicTraverseSessionTom Ouyang2013-04-086-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for the traversal algorithm to know which digraphs (if any) are associated with the current dictionary. Bug: 8493920 Change-Id: I6ae088b55e50c0c2c7066d045b304c5068e23390
* | | | am 224e969e: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-04-090-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '224e969ef481994f274e4cd2ebc1452ebe15d238': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-04-0949-196/+389
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-0849-196/+389
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3605a7fd941d9ebe76460d114f384b1e233b3440 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-04-0949-196/+389
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-0849-196/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I435964e615a92c4c7835769112c3f94b8616a143 Auto-generated-cl: translation import
* | | | | | am 09ab6495: Merge "[FileEncap18] Clean up uploading scheduling"Kurt Partridge2013-04-093-31/+51
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '09ab6495a2ef109043e6d92f5d75304fcce472a3': [FileEncap18] Clean up uploading scheduling
| * | | | | Merge "[FileEncap18] Clean up uploading scheduling"Kurt Partridge2013-04-093-31/+51
| |\ \ \ \ \
| | * | | | | [FileEncap18] Clean up uploading schedulingKurt Partridge2013-03-253-31/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move scheduling logic from ResearchLogger.java to UploaderService.java - Switch to a one-shot timer. Previously the uploader was scheduled on an inexact repeating schedule. It's better to reschedule the next upload after the current one is finished to reduce the chances of multiple uploads happening at the same time. - Avoid double-execution - Previously a scheduled upload might run right after an explicit one if they occured at the same time. This change reduces the chances of this. - Some method extraction and naming Change-Id: I9efda11be77d334c7f61bd40a36d65f0421ebde4
* | | | | | | am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary."Jean Chalard2013-04-093-8/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '19dcd154932b8aef07f371bdda7f879a70c3c3c8': Offer to add any OOV typed word to the dictionary.
| * | | | | | Merge "Offer to add any OOV typed word to the dictionary."Jean Chalard2013-04-093-8/+14
| |\ \ \ \ \ \
| | * | | | | | Offer to add any OOV typed word to the dictionary.Jean Chalard2013-04-093-8/+14
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That includes gestures, which used not to work. Bug: 8532637 Change-Id: I04606565d7000faadf954c4a806c39d4d162a2c1
* | | | | | | am f31553bc: Merge "Fix touch coordinate calibration"Satoshi Kataoka2013-04-0910-32/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f31553bc09f83d21b9321a2c45a2213c28282408': Fix touch coordinate calibration
| * | | | | | Merge "Fix touch coordinate calibration"Satoshi Kataoka2013-04-0910-32/+51
| |\ \ \ \ \ \
| | * | | | | | Fix touch coordinate calibrationSatoshi Kataoka2013-04-0910-32/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TRT: I3b5f3ed07eabc59306a17 Bug: 8505668 Change-Id: I574d25a4e9886c521f013f9a8ffc09cc145fc0fc
* | | | | | | | am ddafcf82: Merge "Fix bugs and add tests"Jean Chalard2013-04-092-9/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddafcf82dcfa0f978bd7fe8b658ace7671d9d8d7': Fix bugs and add tests
| * | | | | | | Merge "Fix bugs and add tests"Jean Chalard2013-04-092-9/+66
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix bugs and add testsJean Chalard2013-04-052-9/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b56b91ace57f4a49584b5dceb71b145859f839e
* | | | | | | | am 1f70a4d6: Merge "Allow logging while replaying"Kurt Partridge2013-04-081-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f70a4d68136a74e89cb9ff0581141eae9d21516': Allow logging while replaying
| * | | | | | | Merge "Allow logging while replaying"Kurt Partridge2013-04-091-2/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Allow logging while replayingKurt Partridge2013-04-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously logging was disabled during replay. This makes it impossible to use logged data as a regression test, since the new log was unavailable. This change corrects this problem. Change-Id: I19dc31def2f2f87fd219dc561c739d18e4ab9c9c
* | | | | | | | | am d117c1a1: Merge "Do not record log split time when handling separator"Kurt Partridge2013-04-081-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd117c1a11635d6389f63ce939f5f15c7cc6a0bba': Do not record log split time when handling separator
| * | | | | | | | Merge "Do not record log split time when handling separator"Kurt Partridge2013-04-091-1/+0
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Do not record log split time when handling separatorKurt Partridge2013-04-011-1/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously handleSeparator() caused the ResearchLogger to mark the time at which a LogUnit should be broken. However, this causes the motion data associated with a separator to be associated with the LogUnit of the previous word. This change corrects this bug. Change-Id: I8b4d4fa6de2a013de9e2a28bb668c446a07f1957
* | | | | / / / am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
|\| | | | | | | | |_|_|_|/ / / |/| | | | | | | | | | | | | * commit 'a8d29082843cc22bb37fcd88ae581affdf0eaec7':
| * | | | | | am d5c8247f: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | * commit 'd5c8247fe908ddda7f8af9009565b5d9dbf41b96':
| | * | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f018ab134e9d80ce71e93fb2462b481f3076fb0
| | | * \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-080-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-040-0/+0
| | | | |\ \ \ \ \
* | | | | | | | | | am d17c8bd9: Update commentsKen Wakasa2013-04-082-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd17c8bd9297607e7318ad2470ae72a27b1d28ec1': Update comments
| * | | | | | | | | Update commentsKen Wakasa2013-04-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6aef328ec9041666cc168c8323bed04d39591b71
* | | | | | | | | | am 31f42ba0: Tiny clean up in MakefileKen Wakasa2013-04-081-5/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31f42ba0c2a9ed073ca6dfed9d4344ca22d6e23d': Tiny clean up in Makefile