Commit Graph

9105 Commits

Author SHA1 Message Date
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
The Android Automerger
5b2a5cfed8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-05 07:00:26 -07:00
Satoshi Kataoka
595b9ea54a am 478605ba: am 448e7322: Follow up change for I5f166a738f6e84a1b807be
* commit '478605baa460d2d595c7ed0da2790b147727d284':
  Follow up change for  I5f166a738f6e84a1b807be
2012-10-05 06:04:26 -07:00
Satoshi Kataoka
49a90081eb am a40f2842: am 78fe885f: Merge "Fix addtional proximity correction" into jb-mr1-dev
* commit 'a40f2842cf9ed085703518ed16ddd9e9f66560da':
  Fix addtional proximity correction
2012-10-05 06:02:48 -07:00
Satoshi Kataoka
478605baa4 am 448e7322: Follow up change for I5f166a738f6e84a1b807be
* commit '448e732272bb3e55d649d2d5dd6a0acb9efdaec3':
  Follow up change for  I5f166a738f6e84a1b807be
2012-10-05 06:02:02 -07:00
Satoshi Kataoka
a40f2842cf am 78fe885f: Merge "Fix addtional proximity correction" into jb-mr1-dev
* commit '78fe885fb3fcea85e5522ae7a09d12febaca9ba7':
  Fix addtional proximity correction
2012-10-05 06:00:26 -07:00
Satoshi Kataoka
448e732272 Follow up change for I5f166a738f6e84a1b807be
Bug: 7283955
Change-Id: Iec716d75e7c8a727b198688f44ef4a8cd1255ec1
2012-10-05 21:39:28 +09:00
Satoshi Kataoka
78fe885fb3 Merge "Fix addtional proximity correction" into jb-mr1-dev 2012-10-05 05:10:15 -07:00
Satoshi Kataoka
441b3e5a90 Fix addtional proximity correction
Change-Id: I3125764b98af28ce423dc12cbf0dac321ef22386
2012-10-05 20:54:57 +09:00
Tadashi G. Takaoka
d7345ed0b5 am d34422f1: am 3623b976: Fix detecting fast typing algorithm and parameter
* commit 'd34422f1b2168346c1ebb230db0238680baafacb':
  Fix detecting fast typing algorithm and parameter
2012-10-05 03:21:11 -07:00
Tadashi G. Takaoka
d34422f1b2 am 3623b976: Fix detecting fast typing algorithm and parameter
* commit '3623b9767b3d5f122f574d4c4d14aa79ed305752':
  Fix detecting fast typing algorithm and parameter
2012-10-05 03:19:24 -07:00
Tadashi G. Takaoka
3623b9767b Fix detecting fast typing algorithm and parameter
Bug: 7032858
Change-Id: I5ed701e2394d16e43258a3c22d59991cb18adce8
2012-10-05 18:23:39 +09:00
Tadashi G. Takaoka
24ebf7da98 am b02fc3fc: am 4580b7e4: Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
* commit 'b02fc3fcdf47796c9e4101b7fee6e77a9b9cdc0f':
  Move gesture detection and recognition paramters to resources
2012-10-04 22:50:12 -07:00
Tadashi G. Takaoka
b02fc3fcdf am 4580b7e4: Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
* commit '4580b7e457db1cace972ce89bd04542ebfe08845':
  Move gesture detection and recognition paramters to resources
2012-10-04 22:44:47 -07:00
Tadashi G. Takaoka
4580b7e457 Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev 2012-10-04 22:42:18 -07:00
Tadashi G. Takaoka
80bcb99632 Move gesture detection and recognition paramters to resources
Bug: 7032858
Change-Id: I66570a5e21cdeede1eba420c597f440ab61aa941
2012-10-05 14:39:44 +09:00
Baligh Uddin
2087e2961d am a7950f64: am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'a7950f642bf195d74eb4ed3c579cb7810448d97e':
  Import translations. DO NOT MERGE
2012-10-04 22:30:54 -07:00