Commit graph

9374 commits

Author SHA1 Message Date
Jean-Baptiste Queru
48ce9e77ce am 4520cde4: (-s ours) am 56b4a040: (-s ours) Reconcile with jb-dev - do not merge
* commit '4520cde4546ce4a442c7438580f41983baba9e28':
2012-10-03 15:33:36 -07:00
Jean-Baptiste Queru
4520cde454 am 56b4a040: (-s ours) Reconcile with jb-dev - do not merge
* commit '56b4a040ff044761268dbeaa2407ebbcf100cb69':
2012-10-03 15:31:15 -07:00
Jean-Baptiste Queru
56b4a040ff Reconcile with jb-dev - do not merge
Change-Id: Ie0db4cf684b9f45cdf5a729f3b62adb2128a7c91
2012-10-03 15:29:09 -07:00
Baligh Uddin
7ed917f412 am e150727b: (-s ours) am 4c059cc6: am 01d9b1f1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'e150727be4c176ad7e5da6fef9704e4283ae49ee':
  Import translations. DO NOT MERGE
2012-10-03 10:23:44 -07:00
Baligh Uddin
e150727be4 am 4c059cc6: am 01d9b1f1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '4c059cc6b67a6b2e61a14ba86b2bcec4fa2f821f':
  Import translations. DO NOT MERGE
2012-10-03 10:21:32 -07:00
Baligh Uddin
c65432460c am 11f72cd4: (-s ours) am 3f4d63e5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '11f72cd4c18dd5013b4425f2e2d5ac0294d3c304':
  Import translations. DO NOT MERGE
2012-10-03 10:21:08 -07:00
Baligh Uddin
4c059cc6b6 am 01d9b1f1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '01d9b1f17a2c4aeb281e05a1390447a76cb3d013':
  Import translations. DO NOT MERGE
2012-10-03 10:19:54 -07:00
Baligh Uddin
11f72cd4c1 am 3f4d63e5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '3f4d63e50b7a0a6a062f70042ee30ce73f1f06c6':
  Import translations. DO NOT MERGE
2012-10-03 10:18:56 -07:00
Baligh Uddin
555cc570d9 Merge "Import translations. DO NOT MERGE" 2012-10-03 10:18:22 -07:00
Baligh Uddin
01d9b1f17a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-03 10:17:21 -07:00
Baligh Uddin
3f4d63e50b Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-03 10:16:55 -07:00
The Android Open Source Project
928d570c7f am 4a1a8c6a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '4a1a8c6ae738e7aefc67327ddcf87be5df072e5d':
2012-10-03 07:40:20 -07:00
The Android Open Source Project
4a1a8c6ae7 Reconcile with jb-mr1-release - do not merge
Change-Id: I7653d40dbf6b2435b5681edd20cf763460422d57
2012-10-03 07:35:19 -07:00
The Android Automerger
da74af9e68 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 07:00:26 -07:00
Jean Chalard
2bd719692c am 6821be7e: am b3dff914: am 5d11ec46: Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev
* commit '6821be7e06ec9bb4e9d9dfe62b75f52b369e1b74':
  Update the AOSP dictionaries for the 0-freq review
2012-10-03 06:04:10 -07:00
Jean Chalard
6821be7e06 am b3dff914: am 5d11ec46: Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev
* commit 'b3dff91404e79d1e4cb5fb968dd19f1200d4d8da':
  Update the AOSP dictionaries for the 0-freq review
2012-10-03 06:00:44 -07:00
Jean Chalard
b3dff91404 am 5d11ec46: Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev
* commit '5d11ec461387e45a208c53182628be6dfbd0d8e1':
  Update the AOSP dictionaries for the 0-freq review
2012-10-03 05:58:33 -07:00
Jean Chalard
5d11ec4613 Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev 2012-10-03 05:37:12 -07:00
Jean Chalard
a44942810d Update the AOSP dictionaries for the 0-freq review
Bug: 7227265
Change-Id: I384f7d76cef67b96b106ddac96e4baf1fa32afd4
2012-10-03 21:15:27 +09:00
Yuichiro Hanada
38712ff27d Add updateParentAddresses.
Change-Id: Iac210131b7c003ef363e1138bf22f777a37c6a89
2012-10-03 19:37:17 +09:00
Yuichiro Hanada
a853356b82 Add isDeletedGroup.
Change-Id: I83f09c068868e5e6e1b46f494a6ef957f0b466d8
2012-10-03 02:19:41 -07:00
Yuichiro Hanada
7223cc2ef1 Add MAX_BIGRAMS_IN_A_GROUP.
Change-Id: I128d5deb8e523045d7ad77d7a8fd3db944f71238
2012-10-03 18:10:06 +09:00
Satoshi Kataoka
69c787f3b7 am 96717371: am e8825ce3: am 1fd10ea2: Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev
* commit '967173711f17ba30d3608881f501985f07fef4fd':
  Throw illegal argument exception in BinaryDictionary::editDistance
2012-10-03 01:21:43 -07:00
Satoshi Kataoka
967173711f am e8825ce3: am 1fd10ea2: Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev
* commit 'e8825ce3e7392ea9eb385dc24b2e51bc961cd759':
  Throw illegal argument exception in BinaryDictionary::editDistance
2012-10-03 01:19:43 -07:00
Satoshi Kataoka
e8825ce3e7 am 1fd10ea2: Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev
* commit '1fd10ea22cb7ac8fb8182bdcb1fea594de9dcf2e':
  Throw illegal argument exception in BinaryDictionary::editDistance
2012-10-03 01:17:16 -07:00
Satoshi Kataoka
1fd10ea22c Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev 2012-10-03 01:15:52 -07:00
Satoshi Kataoka
66d955ad71 Throw illegal argument exception in BinaryDictionary::editDistance
Bug: 7276803
Change-Id: Icd9bdec0a04179a29d00336819d205627f77b71a
2012-10-03 17:15:47 +09:00
Tadashi G. Takaoka
c6ff7c42d9 Add SuggestedWords.isEmpty() method
Change-Id: I0fcb104a6a81aee4b99f5ee848eba7495630dc7d
2012-10-03 15:09:10 +09:00
Tadashi G. Takaoka
3e5a3c18be Add final modifier to the classes under suggestions sub-package
Change-Id: I19fc8eaac1aebef9cf4deb004e78484ff9a1e7ca
2012-10-03 14:57:29 +09:00
Tadashi G. Takaoka
5f5f7825e7 am 4d009dbc: am ace7d128: am d445b56c: Fix possible NPE caused while monkey test
* commit '4d009dbc514cd77eb22e4162e4ae7ea852e1b77e':
  Fix possible NPE caused while monkey test
2012-10-02 22:44:57 -07:00
Tadashi G. Takaoka
4d009dbc51 am ace7d128: am d445b56c: Fix possible NPE caused while monkey test
* commit 'ace7d1285dc1d4ba42d4f767698c5b6078ecbac2':
  Fix possible NPE caused while monkey test
2012-10-02 22:43:13 -07:00
Tadashi G. Takaoka
ace7d1285d am d445b56c: Fix possible NPE caused while monkey test
* commit 'd445b56ce14152b30143302899790af255691148':
  Fix possible NPE caused while monkey test
2012-10-02 22:41:25 -07:00
Yuichiro Hanada
4ad4ff618f Add makeCharGroupFlags.
Change-Id: Id2c580f21b77f66a97c5fbdf4542fdafe6c43614
2012-10-03 14:33:59 +09:00
Tadashi G. Takaoka
d445b56ce1 Fix possible NPE caused while monkey test
Bug: 7269036
Change-Id: I9054b33ad3c8996cac3ee5f0e9c01ba8ceea4971
2012-10-03 14:33:52 +09:00
Baligh Uddin
9c64c5342c Import translations. DO NOT MERGE
Change-Id: Ib35cdfadea03c46e9a71404e79b4a509526f4896
Auto-generated-cl: translation import
2012-10-02 17:14:45 -07:00
Baligh Uddin
7a24a242fd Import translations. DO NOT MERGE
Change-Id: I98e36c91c1678a0452b42c7afda6c3bc08b3b3e6
Auto-generated-cl: translation import
2012-10-02 17:11:15 -07:00
Baligh Uddin
f0f1f6d930 Import translations. DO NOT MERGE
Change-Id: Ie2bbbe8f27946e01a1d6c0975410805adc42faa9
Auto-generated-cl: translation import
2012-10-02 17:10:08 -07:00
The Android Open Source Project
8e01cc768d am 2d1bdcf6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '2d1bdcf6d591a3014b6ee5c583246ae3fd9603eb':
2012-10-02 09:24:48 -07:00
The Android Open Source Project
2d1bdcf6d5 Reconcile with jb-mr1-release - do not merge
Change-Id: I3545b3a031bfc602b6d61db2039c8232fe41588a
2012-10-02 09:20:31 -07:00
The Android Automerger
d8e03757cb merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-02 07:00:18 -07:00
Tadashi G. Takaoka
c3aea8ea9f Merge "Avoid calling switchToLastInputMethod when other IMEs are in effect" 2012-10-02 01:36:37 -07:00
Tadashi G. Takaoka
aec5cc8476 Avoid calling switchToLastInputMethod when other IMEs are in effect
Bug: 7268389
Change-Id: I4d960cbf063002b4dc0ea813c966366b56c0346d
2012-10-02 17:29:15 +09:00
Tadashi G. Takaoka
fe3fb2502d am 58e1be74: am de102ede: am 15281adb: Show gesture floating preview text by default
* commit '58e1be74a989637b0b71ebf990ed1b3c9a21e7af':
  Show gesture floating preview text by default
2012-10-01 23:41:38 -07:00
Baligh Uddin
61fa98b89b am 7321aa8a: (-s ours) am 988482a1: am d80fd305: Import translations. DO NOT MERGE
* commit '7321aa8abf05541ee42aedc20f0fc103fe699124':
  Import translations. DO NOT MERGE
2012-10-01 23:41:33 -07:00
Tadashi G. Takaoka
58e1be74a9 am de102ede: am 15281adb: Show gesture floating preview text by default
* commit 'de102ede499cd3baf93561d06c5fe3e663276d2e':
  Show gesture floating preview text by default
2012-10-01 23:38:12 -07:00
Baligh Uddin
7321aa8abf am 988482a1: am d80fd305: Import translations. DO NOT MERGE
* commit '988482a1154b15c0bfcfe82a9d349828471605b6':
  Import translations. DO NOT MERGE
2012-10-01 23:38:06 -07:00
Baligh Uddin
6c3e2c9bad am 996b142f: (-s ours) am 3ab7fb85: Import translations. DO NOT MERGE
* commit '996b142f76d5da131da9b27f02438020d21b1e14':
  Import translations. DO NOT MERGE
2012-10-01 23:35:37 -07:00
Baligh Uddin
996b142f76 am 3ab7fb85: Import translations. DO NOT MERGE
* commit '3ab7fb8575d1df42aa1fc0535177216183aad6d8':
  Import translations. DO NOT MERGE
2012-10-01 23:33:10 -07:00
Tadashi G. Takaoka
de102ede49 am 15281adb: Show gesture floating preview text by default
* commit '15281adbc1580262888aba6fc73bbbe7fa9e0de8':
  Show gesture floating preview text by default
2012-10-01 23:32:56 -07:00
Baligh Uddin
988482a115 am d80fd305: Import translations. DO NOT MERGE
* commit 'd80fd3058c28fae43d45f239684e3058995424c3':
  Import translations. DO NOT MERGE
2012-10-01 23:32:55 -07:00