The Android Automerger
4d24838718
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 16:27:07 -07:00
Ken Wakasa
b0aa9606ae
am 726e98b7: am c1a1937c: am 2220aeed: Merge "Put temporary files under a separate directory." into jb-mr1-dev
...
* commit '726e98b7378987b2cfe46ea5395692640b108e83':
Put temporary files under a separate directory.
2012-10-11 08:41:42 -07:00
Ken Wakasa
726e98b737
am c1a1937c: am 2220aeed: Merge "Put temporary files under a separate directory." into jb-mr1-dev
...
* commit 'c1a1937c0d079aec18cec992dc5010b409f8fcbd':
Put temporary files under a separate directory.
2012-10-11 08:39:56 -07:00
Ken Wakasa
c1a1937c0d
am 2220aeed: Merge "Put temporary files under a separate directory." into jb-mr1-dev
...
* commit '2220aeedfeeb796d627f2fd659c81256297f145e':
Put temporary files under a separate directory.
2012-10-11 08:37:45 -07:00
Ken Wakasa
2220aeedfe
Merge "Put temporary files under a separate directory." into jb-mr1-dev
2012-10-11 08:36:22 -07:00
The Android Automerger
e1bd1b5167
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:19:51 -07:00
The Android Open Source Project
fa95e9048d
am a65005fd: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a65005fdbb0b2633a02f79d9e38bdf435ad8c98b':
2012-10-11 08:11:30 -07:00
The Android Open Source Project
a65005fdbb
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3734eb2f142b58b1b04df7738eefe766b4f77021
2012-10-11 08:06:10 -07:00
The Android Automerger
be1162f05e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 07:04:24 -07:00
Satoshi Kataoka
1f6930bf64
Merge "Improve gesture input scoring method 2. Align next key to path bases its scoring method on probabilities."
2012-10-11 06:51:21 -07:00
Fredrik Roubert
ce1e491233
Add Swedish to the list of languages for which a Euro key is wanted.
...
Change-Id: I2ba4d0a7e82733c3d9526658195f22178e520926
2012-10-11 15:16:03 +02:00
Jean Chalard
66c90cd2ae
Put temporary files under a separate directory.
...
Bug: 7328003
Change-Id: Ibe5278ea209d149f87fd08785c77b17e3859948e
2012-10-11 17:53:06 +09:00
Tadashi G. Takaoka
ad181915f7
Fix excessive canceling of long-press timer while gesturing
...
Change-Id: I2a68c777e66a6b83d16885780a92a21e91bd3f9e
2012-10-11 17:51:45 +09:00
Tadashi G. Takaoka
c1f2c3a646
am c66a2d1d: am 61155c70: am 9d423536: Merge "Don\'t cancel long press timer too early" into jb-mr1-dev
...
* commit 'c66a2d1da69de796a2a7acb5dd6903cb5668585c':
Don't cancel long press timer too early
2012-10-11 00:52:05 -07:00
Tadashi G. Takaoka
c66a2d1da6
am 61155c70: am 9d423536: Merge "Don\'t cancel long press timer too early" into jb-mr1-dev
...
* commit '61155c708765068c7e3969deb9d07000a558b1ca':
Don't cancel long press timer too early
2012-10-11 00:49:43 -07:00
Tadashi G. Takaoka
61155c7087
am 9d423536: Merge "Don\'t cancel long press timer too early" into jb-mr1-dev
...
* commit '9d42353611d77be82316c79fe598d101639c2486':
Don't cancel long press timer too early
2012-10-11 00:47:50 -07:00
Tadashi G. Takaoka
9d42353611
Merge "Don't cancel long press timer too early" into jb-mr1-dev
2012-10-11 00:46:06 -07:00
Tadashi G. Takaoka
c9ba26994b
Don't cancel long press timer too early
...
Bug: 7328861
Change-Id: I1b77ec4a30ae15b2edda42a1ff58ebc528288553
2012-10-11 15:58:56 +09:00
Baligh Uddin
d8ea90994c
am caa9dba8: (-s ours) am 4209cd74: am 7c8f4a04: Import translations. DO NOT MERGE
...
* commit 'caa9dba8561b0a0cd1505dd4f3f90a07d18e6353':
Import translations. DO NOT MERGE
2012-10-10 22:03:38 -07:00
Baligh Uddin
54f14d9e7d
am 84e4a33e: (-s ours) am b455e1d3: Import translations. DO NOT MERGE
...
* commit '84e4a33e1faf4394f81dbeadfdcbf8f9a5c30ff7':
Import translations. DO NOT MERGE
2012-10-10 22:02:07 -07:00
Baligh Uddin
caa9dba856
am 4209cd74: am 7c8f4a04: Import translations. DO NOT MERGE
...
* commit '4209cd7430902da5634c110641f71bdf601524d2':
Import translations. DO NOT MERGE
2012-10-10 22:01:17 -07:00
Baligh Uddin
84e4a33e1f
am b455e1d3: Import translations. DO NOT MERGE
...
* commit 'b455e1d3ac5915a74c066e1fb935b8ff5a079cca':
Import translations. DO NOT MERGE
2012-10-10 21:59:47 -07:00
Baligh Uddin
4209cd7430
am 7c8f4a04: Import translations. DO NOT MERGE
...
* commit '7c8f4a04fae1de047e520825cc2a22e5eb3a8f2e':
Import translations. DO NOT MERGE
2012-10-10 21:59:46 -07:00
Keisuke Kuroyanagi
ff74cc3e5e
Improve gesture input scoring method 2.
...
Align next key to path bases its scoring method on probabilities.
Change-Id: I5247c965b92c0052bfdab8a9b1027bc86eb33218
2012-10-11 13:08:06 +09:00
Baligh Uddin
e129d6921e
Import translations. DO NOT MERGE
...
Change-Id: Ibb93814ac881cfd48a4a298e2964c9a4188405f0
Auto-generated-cl: translation import
2012-10-10 16:05:53 -07:00
Baligh Uddin
7c8f4a04fa
Import translations. DO NOT MERGE
...
Change-Id: I0a766dd5b65f375276e30c588bb202f6718a8892
Auto-generated-cl: translation import
2012-10-10 16:02:04 -07:00
Baligh Uddin
b455e1d3ac
Import translations. DO NOT MERGE
...
Change-Id: Ieced09ee9144331fdd284282b889c243d71761cd
Auto-generated-cl: translation import
2012-10-10 16:01:02 -07:00
The Android Open Source Project
76cec53f3b
am f5d3ea72: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'f5d3ea7291739898130d91682908bd916642ffbd':
2012-10-10 09:51:09 -07:00
The Android Open Source Project
f5d3ea7291
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I32891bfbd2363343f1b4c65baf43f46e3fd4092e
2012-10-10 09:45:55 -07:00
The Android Automerger
0d5fa440f4
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-10 08:59:15 -07:00
The Android Automerger
b1cd6e29d6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 06:59:52 -07:00
Jean Chalard
6ae5e45118
Stop using private APIs in tests.
...
Not sure it's much better, but at least this is public.
Bug: 6202480
Change-Id: If6cda78fbd32cfb068e0b2fcb637914939b044b3
2012-10-10 20:22:53 +09:00
Jean Chalard
2752287c42
Fix failing tests.
...
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
2012-10-10 19:42:29 +09:00
The Android Automerger
f9001d2aaf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 16:07:28 -07:00
The Android Automerger
c822c8924d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 15:39:27 -07:00
Ken Wakasa
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
Ken Wakasa
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
Ken Wakasa
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
Ken Wakasa
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
Tadashi G. Takaoka
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
Ken Wakasa
471252b9da
Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev
2012-10-09 07:47:06 -07:00
Ken Wakasa
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
Tadashi G. Takaoka
6b0fa314d7
am f5c10d00: am 7a17c1fc: Tuning gesture detection parameters
...
* commit 'f5c10d00a9ae03a792af42f237ee07c6f033dc7a':
Tuning gesture detection parameters
2012-10-09 07:46:39 -07:00
Ken Wakasa
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
Tadashi G. Takaoka
f5c10d00a9
am 7a17c1fc: Tuning gesture detection parameters
...
* commit '7a17c1fcb52f0249108cfcbd789928320706718a':
Tuning gesture detection parameters
2012-10-09 07:43:37 -07:00
Ken Wakasa
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
The Android Open Source Project
e569bf103c
am b031214a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b031214a91b428eb6fc7311a3b090ca99ed5237d':
2012-10-09 07:35:45 -07:00
The Android Open Source Project
b031214a91
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I079f0dc7009858dc8ab8718802e81b29919aa0a8
2012-10-09 07:30:50 -07:00
The Android Automerger
b49b094386
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 06:59:57 -07:00
Jean Chalard
516f9d6ea4
Fix a bug in multiple shortcut handling code.
...
Bug: 7301525
Change-Id: Ib38f5ab4b7e4f7996bccbc6830d46f52fd71c6f9
2012-10-09 20:24:13 +09:00