f9001d2aaf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 16:07:28 -07:00
c822c8924d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 15:39:27 -07:00
3873d36128
am 00f3d809: am a62a1926: am 471252b9: Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev
...
* commit '00f3d8094733de407c9cd2669bf579a4d7740328':
Fix a bug in multiple shortcut handling code.
2012-10-09 08:53:55 -07:00
00f3d80947
am a62a1926: am 471252b9: Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev
...
* commit 'a62a192680c54c6c9152a5ebd448237c0fde171a':
Fix a bug in multiple shortcut handling code.
2012-10-09 07:50:48 -07:00
a62a192680
am 471252b9: Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev
...
* commit '471252b9da20f4b1d7f55fd15a34d3642a564fcb':
Fix a bug in multiple shortcut handling code.
2012-10-09 07:49:17 -07:00
06636bf96a
am 0081681e: am c44314b4: am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev
...
* commit '0081681e346ce5c958e5eef264caa3f257b094c5':
Use a freq of 1 instead of 0 for non-word shortcuts.
2012-10-09 07:48:46 -07:00
4020289147
am 6b0fa314: am f5c10d00: am 7a17c1fc: Tuning gesture detection parameters
...
* commit '6b0fa314d780ea77bd2c65b9bdd87297d50a0f6b':
Tuning gesture detection parameters
2012-10-09 07:48:45 -07:00
471252b9da
Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev
2012-10-09 07:47:06 -07:00
0081681e34
am c44314b4: am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev
...
* commit 'c44314b40464366814179c5a5952a66ef65d9831':
Use a freq of 1 instead of 0 for non-word shortcuts.
2012-10-09 07:46:40 -07:00
6b0fa314d7
am f5c10d00: am 7a17c1fc: Tuning gesture detection parameters
...
* commit 'f5c10d00a9ae03a792af42f237ee07c6f033dc7a':
Tuning gesture detection parameters
2012-10-09 07:46:39 -07:00
c44314b404
am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev
...
* commit 'dc38a3438bca6b46c31b6ac2cbbf8cb0466b5a83':
Use a freq of 1 instead of 0 for non-word shortcuts.
2012-10-09 07:45:03 -07:00
f5c10d00a9
am 7a17c1fc: Tuning gesture detection parameters
...
* commit '7a17c1fcb52f0249108cfcbd789928320706718a':
Tuning gesture detection parameters
2012-10-09 07:43:37 -07:00
dc38a3438b
Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev
2012-10-09 07:43:16 -07:00
e569bf103c
am b031214a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b031214a91b428eb6fc7311a3b090ca99ed5237d':
2012-10-09 07:35:45 -07:00
b031214a91
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I079f0dc7009858dc8ab8718802e81b29919aa0a8
2012-10-09 07:30:50 -07:00
b49b094386
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 06:59:57 -07:00
516f9d6ea4
Fix a bug in multiple shortcut handling code.
...
Bug: 7301525
Change-Id: Ib38f5ab4b7e4f7996bccbc6830d46f52fd71c6f9
2012-10-09 20:24:13 +09:00
806eba4524
Improve gesture input scoring method 1.
...
Calculate probabilities for each points in advance.
It enables to input not in the dictionary word.
Change-Id: I8d84642045dc3b8ad49719d9b70dda14457995cd
2012-10-09 19:58:20 +09:00
11cec73499
Merge "Disable touch position correction of MoreKeysKeyboard"
2012-10-09 03:39:43 -07:00
f9aa99c1c9
Disable touch position correction of MoreKeysKeyboard
...
Change-Id: Ieec33894a348602fd71d6fe473142b43eb2551b6
2012-10-09 19:20:28 +09:00
99b84b42f9
Use a freq of 1 instead of 0 for non-word shortcuts.
...
Also fix a spelling mistake in a comment
Bug: 7301525
Change-Id: I4437403dce620fed03871485ee04f13c51ce34fc
2012-10-09 19:16:07 +09:00
7a17c1fcb5
Tuning gesture detection parameters
...
Bug: 7032858
Change-Id: Ie4f952aa33b99ce16027500a596d723ee9bafae9
2012-10-09 19:06:10 +09:00
7cbb7f92ee
Merge "Allow to start gesture from a non-letter key except from a modifier key"
2012-10-09 02:20:28 -07:00
4df6549c1a
Allow to start gesture from a non-letter key except from a modifier key
...
Bug: 7303982
Change-Id: Id54965c1d7b2b760ac2a76a0fc509b46948e75e6
2012-10-09 18:03:40 +09:00
b02ee3d67a
Make use of the NELEMS and KEYCODE_SPACE macro. Also, remove an unused parameter.
...
Change-Id: I3c7e6c59990c92b0d5e2fb80493e8673cdd37b09
2012-10-09 11:17:50 +09:00
60f6120e2b
am 988d848b: (-s ours) am cb928e27: am 2e3f261d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '988d848b08ef47b50f94cd2487f2c9add75c62c4':
Import translations. DO NOT MERGE
2012-10-08 10:57:00 -07:00
5711f0d1de
am a6b3ac72: (-s ours) am 38af8108: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'a6b3ac72778d3e31d2b297dedfa94799e389d7b3':
Import translations. DO NOT MERGE
2012-10-08 10:56:59 -07:00
988d848b08
am cb928e27: am 2e3f261d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'cb928e2761ff4d2f2d788eb9f12f84e753480297':
Import translations. DO NOT MERGE
2012-10-08 09:21:19 -07:00
a6b3ac7277
am 38af8108: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '38af8108c169067479968b6f4ca7e4d8f0ac7c3b':
Import translations. DO NOT MERGE
2012-10-08 09:21:17 -07:00
cb928e2761
am 2e3f261d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2e3f261df8d4603ec485d8bb665a87edc93ca6c1':
Import translations. DO NOT MERGE
2012-10-08 09:20:14 -07:00
38af8108c1
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-08 09:19:41 -07:00
90c52f3121
Merge "Import translations. DO NOT MERGE"
2012-10-08 09:19:13 -07:00
2e3f261df8
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-08 09:17:44 -07:00
3efe5f386f
am bb249cb9: am b1583b9e: am 052b162d: Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev
...
* commit 'bb249cb992941ea0f3b6b962232ead147011865a':
Add separate key hysteresis distance for sliding modifier input
2012-10-07 09:09:59 -07:00
d6d9204663
am 0c49a9f7: (-s ours) am c0a5f07c: am 792980d4: Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
...
* commit '0c49a9f7a678655080a3019394da7c604e65265f':
Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
2012-10-07 09:09:56 -07:00
bb249cb992
am b1583b9e: am 052b162d: Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev
...
* commit 'b1583b9eca9e0c57a1b1caefe84af04a8477f6d7':
Add separate key hysteresis distance for sliding modifier input
2012-10-07 09:06:43 -07:00
0c49a9f7a6
am c0a5f07c: am 792980d4: Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
...
* commit 'c0a5f07c9bf93962e3082ca770aa32f96811bcd9':
Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
2012-10-07 09:06:42 -07:00
b1583b9eca
am 052b162d: Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev
...
* commit '052b162df6d7ae35840198bf84fc422f956ba9e8':
Add separate key hysteresis distance for sliding modifier input
2012-10-07 09:02:10 -07:00
c0a5f07c9b
am 792980d4: Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
...
* commit '792980d4aa4d0d91a5acfcbaba3f4471f1d2c073':
Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
2012-10-07 09:02:09 -07:00
5f994e5cc3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 07:00:03 -07:00
fc62882591
Fix a small typo
...
Change-Id: I813d97b9453f8aa7aae99bd165336b1e5a81dc6a
2012-10-07 12:05:23 +09:00
052b162df6
Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev
2012-10-06 10:43:04 -07:00
f731eb1760
Add separate key hysteresis distance for sliding modifier input
...
Bug: 7294402
Change-Id: I78c8be9e1a7b2d49d86bfe1e3a46d1785bfe5d48
2012-10-07 01:19:01 +09:00
792980d4aa
Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
...
Bug: 7299050
Change-Id: Ife6721a5fcbc4872bd36ffd8a8b81b04d73aebec
2012-10-06 19:01:36 +09:00
2d2ed168fa
Import translations. DO NOT MERGE
...
Change-Id: Idaa866090d4afcf78178fff481ee601a2fcbe064
Auto-generated-cl: translation import
2012-10-05 17:01:15 -07:00
d528f4c9a7
Import translations. DO NOT MERGE
...
Change-Id: If42a2ec942dd630d4d17e37536a197ba29431580
Auto-generated-cl: translation import
2012-10-05 16:57:52 -07:00
26b8a7387d
Import translations. DO NOT MERGE
...
Change-Id: I7a00e81b3cf3cf05986f9228901a9f3e645f2a76
Auto-generated-cl: translation import
2012-10-05 16:56:46 -07:00
c2122610bb
am eca0b552: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'eca0b552dd93a3e24fe90f6e0cc014e808daffb8':
2012-10-05 08:20:56 -07:00
eca0b552dd
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ib69160e84d0803f668e62c9425a0b4e6480ab77b
2012-10-05 08:18:27 -07:00
5b2a5cfed8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-05 07:00:26 -07:00
The Android Automerger
Ken Wakasa
Tadashi G. Takaoka
The Android Open Source Project
Jean Chalard
Keisuke Kuroyanagi
Baligh Uddin