aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / /
| | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | |\ \ \
| | | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | |/| | | | | | |/|/ / /
| * | | | | | Stop using private APIs in tests.Jean Chalard2012-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure it's much better, but at least this is public. Bug: 6202480 Change-Id: If6cda78fbd32cfb068e0b2fcb637914939b044b3
| * | | | | | Fix failing tests.Jean Chalard2012-10-104-16/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the failures can be ascribed to the tests not passing the correct old position of the cursor on a second call to onUpdateSelection() to LatinIME. Bug: 7276565 Bug: 7276805 Bug: 7276195 Change-Id: I3f1b52cdcc783ea18838408bed50699b7254eaf4
| * | | | | | am 00f3d809: am a62a1926: am 471252b9: Merge "Fix a bug in multiple shortcut ↵Ken Wakasa2012-10-091-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling code." into jb-mr1-dev * commit '00f3d8094733de407c9cd2669bf579a4d7740328': Fix a bug in multiple shortcut handling code.
| | * | | | | am a62a1926: am 471252b9: Merge "Fix a bug in multiple shortcut handling ↵Ken Wakasa2012-10-091-1/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code." into jb-mr1-dev * commit 'a62a192680c54c6c9152a5ebd448237c0fde171a': Fix a bug in multiple shortcut handling code.
| | | * | | | am 471252b9: Merge "Fix a bug in multiple shortcut handling code." into ↵Ken Wakasa2012-10-091-1/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '471252b9da20f4b1d7f55fd15a34d3642a564fcb': Fix a bug in multiple shortcut handling code.
| | | | * | | Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-devKen Wakasa2012-10-091-1/+0
| | | | |\ \ \
| | | | | * | | Fix a bug in multiple shortcut handling code.Jean Chalard2012-10-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7301525 Change-Id: Ib38f5ab4b7e4f7996bccbc6830d46f52fd71c6f9
| * | | | | | | am 0081681e: am c44314b4: am dc38a343: Merge "Use a freq of 1 instead of 0 ↵Ken Wakasa2012-10-092-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for non-word shortcuts." into jb-mr1-dev * commit '0081681e346ce5c958e5eef264caa3f257b094c5': Use a freq of 1 instead of 0 for non-word shortcuts.
| | * | | | | | am c44314b4: am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word ↵Ken Wakasa2012-10-092-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shortcuts." into jb-mr1-dev * commit 'c44314b40464366814179c5a5952a66ef65d9831': Use a freq of 1 instead of 0 for non-word shortcuts.
| | | * | | | | am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word shortcuts." ↵Ken Wakasa2012-10-092-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'dc38a3438bca6b46c31b6ac2cbbf8cb0466b5a83': Use a freq of 1 instead of 0 for non-word shortcuts.
| | | | * | | | Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-devKen Wakasa2012-10-092-2/+2
| | | | |\ \ \ \
| | | | | * | | | Use a freq of 1 instead of 0 for non-word shortcuts.Jean Chalard2012-10-092-2/+2
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix a spelling mistake in a comment Bug: 7301525 Change-Id: I4437403dce620fed03871485ee04f13c51ce34fc
| * | | | | | | am 6b0fa314: am f5c10d00: am 7a17c1fc: Tuning gesture detection parametersTadashi G. Takaoka2012-10-093-37/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b0fa314d780ea77bd2c65b9bdd87297d50a0f6b': Tuning gesture detection parameters
| | * | | | | | am f5c10d00: am 7a17c1fc: Tuning gesture detection parametersTadashi G. Takaoka2012-10-093-37/+31
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5c10d00a9ae03a792af42f237ee07c6f033dc7a': Tuning gesture detection parameters
| | | * | | | | am 7a17c1fc: Tuning gesture detection parametersTadashi G. Takaoka2012-10-093-37/+31
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a17c1fcb52f0249108cfcbd789928320706718a': Tuning gesture detection parameters
| | | | * | | | Tuning gesture detection parametersTadashi G. Takaoka2012-10-093-37/+31
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7032858 Change-Id: Ie4f952aa33b99ce16027500a596d723ee9bafae9
| * | | | | | am b031214a: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b031214a91b428eb6fc7311a3b090ca99ed5237d':
| | * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-090-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | Change-Id: I079f0dc7009858dc8ab8718802e81b29919aa0a8
| | | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-070-0/+0
| | | | |\ \ \
| * | | | | | | Improve gesture input scoring method 1.Keisuke Kuroyanagi2012-10-094-59/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculate probabilities for each points in advance. It enables to input not in the dictionary word. Change-Id: I8d84642045dc3b8ad49719d9b70dda14457995cd
| * | | | | | | Merge "Disable touch position correction of MoreKeysKeyboard"Tadashi G. Takaoka2012-10-092-2/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Disable touch position correction of MoreKeysKeyboardTadashi G. Takaoka2012-10-092-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieec33894a348602fd71d6fe473142b43eb2551b6
| * | | | | | | | Merge "Allow to start gesture from a non-letter key except from a modifier key"Tadashi G. Takaoka2012-10-091-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Allow to start gesture from a non-letter key except from a modifier keyTadashi G. Takaoka2012-10-091-2/+2
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7303982 Change-Id: Id54965c1d7b2b760ac2a76a0fc509b46948e75e6
| * / / / / / / / Make use of the NELEMS and KEYCODE_SPACE macro. Also, remove an unused ↵Ken Wakasa2012-10-0913-53/+39
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter. Change-Id: I3c7e6c59990c92b0d5e2fb80493e8673cdd37b09
| * | | | | | | am 988d848b: (-s ours) am cb928e27: am 2e3f261d: Merge "Import translations. ↵Baligh Uddin2012-10-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE" into jb-mr1-dev * commit '988d848b08ef47b50f94cd2487f2c9add75c62c4': Import translations. DO NOT MERGE
| | * | | | | | am cb928e27: am 2e3f261d: Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-080-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'cb928e2761ff4d2f2d788eb9f12f84e753480297': Import translations. DO NOT MERGE
| | | * | | | | am 2e3f261d: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-080-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e3f261df8d4603ec485d8bb665a87edc93ca6c1': Import translations. DO NOT MERGE
| | | | * | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-081-2/+2
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If42a2ec942dd630d4d17e37536a197ba29431580 Auto-generated-cl: translation import
| * | | | | | | am a6b3ac72: (-s ours) am 38af8108: Merge "Import translations. DO NOT ↵Baligh Uddin2012-10-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-mr1-aah-dev * commit 'a6b3ac72778d3e31d2b297dedfa94799e389d7b3': Import translations. DO NOT MERGE
| | * | | | | | am 38af8108: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-devBaligh Uddin2012-10-081-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38af8108c169067479968b6f4ca7e4d8f0ac7c3b': Import translations. DO NOT MERGE
| | | * | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-devBaligh Uddin2012-10-081-2/+2
| | | |\ \ \ \ \
| | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a00e81b3cf3cf05986f9228901a9f3e645f2a76 Auto-generated-cl: translation import
| * | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-10-081-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idaa866090d4afcf78178fff481ee601a2fcbe064 Auto-generated-cl: translation import
| * | | | | | | | | am bb249cb9: am b1583b9e: am 052b162d: Merge "Add separate key hysteresis ↵Tadashi G. Takaoka2012-10-076-22/+48
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | distance for sliding modifier input" into jb-mr1-dev * commit 'bb249cb992941ea0f3b6b962232ead147011865a': Add separate key hysteresis distance for sliding modifier input
| | * | | | | | | | am b1583b9e: am 052b162d: Merge "Add separate key hysteresis distance for ↵Tadashi G. Takaoka2012-10-076-22/+48
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sliding modifier input" into jb-mr1-dev * commit 'b1583b9eca9e0c57a1b1caefe84af04a8477f6d7': Add separate key hysteresis distance for sliding modifier input
| | | * | | | | | | am 052b162d: Merge "Add separate key hysteresis distance for sliding ↵Tadashi G. Takaoka2012-10-076-22/+48
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modifier input" into jb-mr1-dev * commit '052b162df6d7ae35840198bf84fc422f956ba9e8': Add separate key hysteresis distance for sliding modifier input
| | | | * | | | | | Merge "Add separate key hysteresis distance for sliding modifier input" into ↵Tadashi G. Takaoka2012-10-066-22/+48
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| | | | | * | | | | | Add separate key hysteresis distance for sliding modifier inputTadashi G. Takaoka2012-10-076-22/+48
| | | | | | |_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7294402 Change-Id: I78c8be9e1a7b2d49d86bfe1e3a46d1785bfe5d48
| * | | | | | | | | am 0c49a9f7: (-s ours) am c0a5f07c: am 792980d4: Avoid calling ↵Tadashi G. Takaoka2012-10-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE) * commit '0c49a9f7a678655080a3019394da7c604e65265f': Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
| | * | | | | | | | am c0a5f07c: am 792980d4: Avoid calling switchToLastInputMethod when other ↵Tadashi G. Takaoka2012-10-071-5/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMEs are in effect (DO NOT MERGE) * commit 'c0a5f07c9bf93962e3082ca770aa32f96811bcd9': Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
| | | * | | | | | | am 792980d4: Avoid calling switchToLastInputMethod when other IMEs are in ↵Tadashi G. Takaoka2012-10-071-5/+8
| | | |\| | | | | | | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect (DO NOT MERGE) * commit '792980d4aa4d0d91a5acfcbaba3f4471f1d2c073': Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
| | | | * | | | | Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT ↵Tadashi G. Takaoka2012-10-061-5/+8
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE) Bug: 7299050 Change-Id: Ife6721a5fcbc4872bd36ffd8a8b81b04d73aebec