2dd555077e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 07:00:06 -07:00
3e37b22fa7
am ee4b3e64: (-s ours) am e5fd5ea5: am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'ee4b3e64ee95bd17c81cdd87a0de60ebbbf1ebe9':
Import translations. DO NOT MERGE
2012-10-16 22:34:35 -07:00
ee4b3e64ee
am e5fd5ea5: am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e5fd5ea596c769f496be54960e26ef0da220f83e':
Import translations. DO NOT MERGE
2012-10-16 22:32:27 -07:00
c1b5108bde
am 72339a62: (-s ours) am c561cc2b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '72339a62e13c0d51fbc67e59d28b1e7cff5142d9':
Import translations. DO NOT MERGE
2012-10-16 22:32:06 -07:00
e5fd5ea596
am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'dbba676c00cd5479e292a91c5672d920b9137759':
Import translations. DO NOT MERGE
2012-10-16 22:30:16 -07:00
72339a62e1
am c561cc2b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'c561cc2b641cecdc8f5c29a7a3ac17bae6282747':
Import translations. DO NOT MERGE
2012-10-16 22:29:58 -07:00
52992085f5
Merge "Import translations. DO NOT MERGE"
2012-10-16 22:28:24 -07:00
dbba676c00
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 22:27:36 -07:00
c561cc2b64
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 22:27:14 -07:00
c5dc32ac59
am b37e87e7: am 63b3fc0d: am 15142588: Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
...
* commit 'b37e87e7d50725f20a6b2f8484fc25cc7db3134f':
Have "no whitespace before cursor" upon gesture trigger phantom space
2012-10-16 18:12:50 -07:00
b37e87e7d5
am 63b3fc0d: am 15142588: Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
...
* commit '63b3fc0d23696ec33b3cbe817bdd77f5d1a0aa03':
Have "no whitespace before cursor" upon gesture trigger phantom space
2012-10-16 18:11:02 -07:00
63b3fc0d23
am 15142588: Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
...
* commit '15142588244a10b241f5d3691f80b6540f3f3fc3':
Have "no whitespace before cursor" upon gesture trigger phantom space
2012-10-16 18:08:11 -07:00
1514258824
Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
2012-10-16 18:06:11 -07:00
e91d495c53
Have "no whitespace before cursor" upon gesture trigger phantom space
...
Bug: 7359291
Bug: 7357758
Bug: 7197651
Change-Id: Ia805a87e922739ae0a06978a3bf00d91c94b6c51
2012-10-17 09:36:07 +09:00
788c885aa5
am 344a7fef: am 658e935b: am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev
...
* commit '344a7fef5bd101e2d1c4278cc35de2862f28a456':
Fix more suggestions text width calculation
2012-10-16 17:32:00 -07:00
477088c612
am 6b169dc9: am 718a0744: am 0cbc19b0: Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
...
* commit '6b169dc91d7533d36bc1f5864bcaf05450af3beb':
Restrict bogus move event detector to a horizontal movement
2012-10-16 17:31:56 -07:00
344a7fef5b
am 658e935b: am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev
...
* commit '658e935ba1d7763854b2df87d90f7d374a81c7a1':
Fix more suggestions text width calculation
2012-10-16 17:29:39 -07:00
6b169dc91d
am 718a0744: am 0cbc19b0: Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
...
* commit '718a07441ee27c0ba66d3d7aa9d1299c39e7f8b1':
Restrict bogus move event detector to a horizontal movement
2012-10-16 17:29:37 -07:00
fa3d984d1b
am 60211f0d: am 2631fe4c: am 6686e63f: Honor automatic shift turned off for gestures
...
* commit '60211f0d250ca931788d32d5a69c880f75ef7d49':
Honor automatic shift turned off for gestures
2012-10-16 17:28:18 -07:00
658e935ba1
am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev
...
* commit 'c0bc3369555435c677804b652b5fb36faf3602e5':
Fix more suggestions text width calculation
2012-10-16 17:26:59 -07:00
718a07441e
am 0cbc19b0: Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
...
* commit '0cbc19b0b1d2540cd4bebf20ce4fb62c014e9cac':
Restrict bogus move event detector to a horizontal movement
2012-10-16 17:26:58 -07:00
60211f0d25
am 2631fe4c: am 6686e63f: Honor automatic shift turned off for gestures
...
* commit '2631fe4c4ea2135ae439381bd62d7c94b99b0e45':
Honor automatic shift turned off for gestures
2012-10-16 17:25:58 -07:00
c0bc336955
Merge "Fix more suggestions text width calculation" into jb-mr1-dev
2012-10-16 17:24:35 -07:00
0cbc19b0b1
Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
2012-10-16 17:24:23 -07:00
2631fe4c4e
am 6686e63f: Honor automatic shift turned off for gestures
...
* commit '6686e63f2158eff07e39ff002ba211d0578f2a4f':
Honor automatic shift turned off for gestures
2012-10-16 17:23:29 -07:00
ed48f8e4bc
Import translations. DO NOT MERGE
...
Change-Id: I69bfbfe56c58ccc2d1c0422c9d8e93d68c6202b5
Auto-generated-cl: translation import
2012-10-16 15:59:26 -07:00
9381ab669f
Import translations. DO NOT MERGE
...
Change-Id: Id5c72cda8d563010caedd2f3ed454e34084e56c1
Auto-generated-cl: translation import
2012-10-16 15:55:56 -07:00
97903bf95e
Import translations. DO NOT MERGE
...
Change-Id: I16dccd4bf5897d4b62a4642fbb3d24bd379deb4e
Auto-generated-cl: translation import
2012-10-16 15:55:23 -07:00
6501204007
Import translations. DO NOT MERGE
...
Change-Id: Ibab3b46b8d19b4d8d2dc69f08be84dcc7431ddf1
Auto-generated-cl: translation import
2012-10-16 15:54:10 -07:00
d631778e1c
Restrict bogus move event detector to a horizontal movement
...
The bogus move detection threshold is in proportional to a diagonal
length of a key. It was in proportional to a key width.
Bug: 7346614
Change-Id: I796add8aea16dd05e9844d6c4fba8072eece39c6
2012-10-16 14:53:54 -07:00
bdc8b9e42b
Fix more suggestions text width calculation
...
Bug: 7345983
Change-Id: Ic1554db98e7aaf032eb90a98c0c37c7c789461b5
2012-10-16 14:24:30 -07:00
6686e63f21
Honor automatic shift turned off for gestures
...
Bug: 7354129
Change-Id: Ia02336e8cea2f04b629edbe74b7815cce0d7fad6
2012-10-17 05:41:06 +09:00
8fa3c6de9e
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-15 12:31:33 -07:00
3bfe1ce3d0
am fd04a7ab: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'fd04a7abe7722be94c84e24dc71a2b695e3ddafc':
2012-10-15 07:43:15 -07:00
fd04a7abe7
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: Ib3966b6c9ec856c39096899083cb41fa25434047
2012-10-15 07:40:37 -07:00
1e0255d145
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-15 06:59:54 -07:00
5cbb130618
am abd8170e: am f2eeb4ae: am c1bcb8ee: Let\'s enhance
...
* commit 'abd8170efd40804504eb9022a9e685bb01ffdc59':
Let's enhance
2012-10-14 23:13:19 -07:00
abd8170efd
am f2eeb4ae: am c1bcb8ee: Let\'s enhance
...
* commit 'f2eeb4ae41559cdab94aaa9168c0f620c1883a41':
Let's enhance
2012-10-14 23:10:44 -07:00
f2eeb4ae41
am c1bcb8ee: Let\'s enhance
...
* commit 'c1bcb8ee104fd256cfda2d11b38336c9b3b3a0d3':
Let's enhance
2012-10-14 23:04:57 -07:00
de87b4dec3
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 16:34:41 -07:00
c1bcb8ee10
Let's enhance
...
Add mipmap-* launcher icon assets. Remove drawable-* based assests.
Change over reference to mipmap icon.
Bug: 6718166
Change-Id: I01f84a03fd1be0ced9cce9cff322a5fe02820075
2012-10-12 14:19:40 -07:00
ae3bb5e65b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 11:50:23 -07:00
dd7db83423
am a13087e1: am 9c318bc5: am ac2a154a: Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev
...
* commit 'a13087e1abf48f8599795b9abb4f49a596a6f32c':
Detect bogus down-move-up event and add workaround
2012-10-12 11:14:00 -07:00
a13087e1ab
am 9c318bc5: am ac2a154a: Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev
...
* commit '9c318bc5d1c3ec6a0b724a9d2c70e911228b9025':
Detect bogus down-move-up event and add workaround
2012-10-12 11:04:19 -07:00
cecad3c22c
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 10:27:33 -07:00
9c318bc5d1
am ac2a154a: Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev
...
* commit 'ac2a154ae82568656e7936e82c6a13ad507ab41e':
Detect bogus down-move-up event and add workaround
2012-10-12 07:01:10 -07:00
ac2a154ae8
Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev
2012-10-12 06:59:42 -07:00
b0952888eb
Detect bogus down-move-up event and add workaround
...
Bug: 7032858
Change-Id: I2e76bf49f1e07b436d05c19881e2f2c4fed21621
2012-10-12 20:45:08 +09:00
b5f1916c74
Merge "Make a better choice for the temporary file"
2012-10-12 03:59:10 -07:00
01e0913ad2
Make a better choice for the temporary file
...
Change-Id: I745bb285b6b52875c8d2b3a94deb962352f9754e
2012-10-12 19:58:07 +09:00
The Android Automerger
Baligh Uddin
Jean Chalard
Tadashi G. Takaoka
The Android Open Source Project
Jason Chen