Commit graph

10108 commits

Author SHA1 Message Date
Baligh Uddin
2e3f261df8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 09:17:44 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
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
Ken Wakasa
fc62882591 Fix a small typo
Change-Id: I813d97b9453f8aa7aae99bd165336b1e5a81dc6a
2012-10-07 12:05:23 +09: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
2d2ed168fa Import translations. DO NOT MERGE
Change-Id: Idaa866090d4afcf78178fff481ee601a2fcbe064
Auto-generated-cl: translation import
2012-10-05 17:01:15 -07: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
c2122610bb am eca0b552: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'eca0b552dd93a3e24fe90f6e0cc014e808daffb8':
2012-10-05 08:20:56 -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
b3ef79b6cc am 595b9ea5: am 478605ba: am 448e7322: Follow up change for I5f166a738f6e84a1b807be
* commit '595b9ea54a21988ae4209779ac2dae9898aa43e2':
  Follow up change for  I5f166a738f6e84a1b807be
2012-10-05 06:06:49 -07:00
Satoshi Kataoka
c5965ffe62 am 49a90081: am a40f2842: am 78fe885f: Merge "Fix addtional proximity correction" into jb-mr1-dev
* commit '49a90081ebaef2e34ea4bb10588b9b0a6e09062c':
  Fix addtional proximity correction
2012-10-05 06:05:10 -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
9778ac3fdd am d7345ed0: am d34422f1: am 3623b976: Fix detecting fast typing algorithm and parameter
* commit 'd7345ed0b532eaa2082adea6fb5e89f5fe0acb86':
  Fix detecting fast typing algorithm and parameter
2012-10-05 03:22:09 -07: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
Yuichiro Hanada
6def28d1da Make unit tests create temporary files in the cache directory.
Change-Id: I90791b364b441bc4e8e221d9e668372d15591719
2012-10-05 15:17:13 +09:00
Ken Wakasa
035b260058 Merge "fix writeCharGroup." 2012-10-04 23:05:51 -07:00
Yuichiro Hanada
d2579c4832 fix writeCharGroup.
Change-Id: Ib841afaba0a20c3b300eb7d3e9133243f9f3ae58
2012-10-05 14:54:17 +09:00
Tadashi G. Takaoka
ddf8b9e1ea am 24ebf7da: am b02fc3fc: am 4580b7e4: Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
* commit '24ebf7da9853f2975bf1ae3e11c0cf1962236667':
  Move gesture detection and recognition paramters to resources
2012-10-04 22:54:16 -07: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
4b46c2c121 am 2087e296: (-s ours) am a7950f64: am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '2087e2961d41122360df4e0104c49bbc42c0f118':
  Import translations. DO NOT MERGE
2012-10-04 22:33:06 -07: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
Baligh Uddin
ca099a39a0 am d1c36cff: (-s ours) am 3b17c7f3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'd1c36cffa9689ed1ec88c1eb6c8d09f4ac49db51':
  Import translations. DO NOT MERGE
2012-10-04 22:30:36 -07:00
Baligh Uddin
a7950f642b am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '47417ec155c38140df51ddea7afd01174e37cea3':
  Import translations. DO NOT MERGE
2012-10-04 22:28:52 -07:00
Baligh Uddin
d1c36cffa9 am 3b17c7f3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '3b17c7f3b45eb1c63bdedbdbd62de414f1a414e1':
  Import translations. DO NOT MERGE
2012-10-04 22:28:22 -07:00
Baligh Uddin
b931a6c912 Merge "Import translations. DO NOT MERGE" 2012-10-04 22:26:06 -07:00
Baligh Uddin
47417ec155 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 22:25:13 -07:00
Baligh Uddin
3b17c7f3b4 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 22:24:45 -07:00
Jean Chalard
46bd04ca4b am ddc81746: am c8cf1101: am 49d301e9: Add notice for Lexiteria dictionaries.
* commit 'ddc8174657777ff3166e536fb8029a0a0b629481':
  Add notice for Lexiteria dictionaries.
2012-10-04 20:34:21 -07:00
Jean Chalard
ddc8174657 am c8cf1101: am 49d301e9: Add notice for Lexiteria dictionaries.
* commit 'c8cf110100b24ed6f968fca194a7090eafb8a9c1':
  Add notice for Lexiteria dictionaries.
2012-10-04 19:32:32 -07:00
Jean Chalard
c8cf110100 am 49d301e9: Add notice for Lexiteria dictionaries.
* commit '49d301e9ad470a83048e0a5093cd88e54dd491be':
  Add notice for Lexiteria dictionaries.
2012-10-04 19:30:54 -07:00