Commit graph

9121 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Jean Chalard
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
Tadashi G. Takaoka
7a17c1fcb5 Tuning gesture detection parameters
Bug: 7032858
Change-Id: Ie4f952aa33b99ce16027500a596d723ee9bafae9
2012-10-09 19:06:10 +09:00
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
38af8108c1 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-08 09:19:41 -07:00
Baligh Uddin
2e3f261df8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 09:17:44 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
The Android Automerger
5f994e5cc3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 07:00:03 -07:00
Tadashi G. Takaoka
052b162df6 Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev 2012-10-06 10:43:04 -07:00
Tadashi G. Takaoka
f731eb1760 Add separate key hysteresis distance for sliding modifier input
Bug: 7294402
Change-Id: I78c8be9e1a7b2d49d86bfe1e3a46d1785bfe5d48
2012-10-07 01:19:01 +09:00
Tadashi G. Takaoka
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
Baligh Uddin
d528f4c9a7 Import translations. DO NOT MERGE
Change-Id: If42a2ec942dd630d4d17e37536a197ba29431580
Auto-generated-cl: translation import
2012-10-05 16:57:52 -07:00
Baligh Uddin
26b8a7387d Import translations. DO NOT MERGE
Change-Id: I7a00e81b3cf3cf05986f9228901a9f3e645f2a76
Auto-generated-cl: translation import
2012-10-05 16:56:46 -07:00
The Android Open Source Project
eca0b552dd Reconcile with jb-mr1-release - do not merge
Change-Id: Ib69160e84d0803f668e62c9425a0b4e6480ab77b
2012-10-05 08:18:27 -07:00