Commit graph

7897 commits

Author SHA1 Message Date
The Android Open Source Project
3cccaeb300 am 4fbdaacb: Reconcile with jb-release nakasi-factoryrom-release
* commit '4fbdaacb208c350a7a01aa3f2062e09e71f83daa':
2012-05-24 09:08:27 -07:00
The Android Open Source Project
4fbdaacb20 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Idc407af8f1c35eec3901797e62283f15b5ca147a
2012-05-24 09:01:48 -07:00
The Android Automerger
433da6aa89 merge in jb-release history after reset to jb-dev 2012-05-24 07:02:09 -07:00
Jean Chalard
5ea26193a2 am d8b3e5c6: am 0c207144: Merge "Fix a bug with a concurrent modification of a map." into jb-dev
* commit 'd8b3e5c69f4de663c748c82155fc3b8854119826':
  Fix a bug with a concurrent modification of a map.
2012-05-24 03:44:06 -07:00
Jean Chalard
d8b3e5c69f am 0c207144: Merge "Fix a bug with a concurrent modification of a map." into jb-dev
* commit '0c20714403d3548d1500cf8ac30041bedeae23d5':
  Fix a bug with a concurrent modification of a map.
2012-05-24 03:41:37 -07:00
Jean Chalard
0c20714403 Merge "Fix a bug with a concurrent modification of a map." into jb-dev 2012-05-24 03:39:09 -07:00
Jean Chalard
1b06b59e28 Fix a bug with a concurrent modification of a map.
Bug: 6538848
Change-Id: I1a8422356d9909213e53cfdc8c5bcc12eb48f19d
2012-05-24 19:38:04 +09:00
Tadashi G. Takaoka
d74d2f9c33 am f726d09b: am f11c8cd1: Merge "Get rid of heavy IPC call from key drawing code" into jb-dev
* commit 'f726d09b53e16a9602090da062393bdf9f34282f':
  Get rid of heavy IPC call from key drawing code
2012-05-24 03:37:26 -07:00
Jean Chalard
63188bb898 am 21d5a015: am 28d82a3a: Merge "Remove non-words from the French dictionary." into jb-dev
* commit '21d5a0157e18325e982b763ce253cfe3266f231a':
  Remove non-words from the French dictionary.
2012-05-24 03:37:24 -07:00
Jean Chalard
35dacc8e78 am 9b98c4a8: am 69897af2: Merge "Add new locales for the spell checker." into jb-dev
* commit '9b98c4a8ce496fa45b8ad6e7da57063c79d1d9e4':
  Add new locales for the spell checker.
2012-05-24 03:37:22 -07:00
Tadashi G. Takaoka
f726d09b53 am f11c8cd1: Merge "Get rid of heavy IPC call from key drawing code" into jb-dev
* commit 'f11c8cd15a0b24231dba886c2135833a94923793':
  Get rid of heavy IPC call from key drawing code
2012-05-24 03:33:20 -07:00
Jean Chalard
21d5a0157e am 28d82a3a: Merge "Remove non-words from the French dictionary." into jb-dev
* commit '28d82a3ad349127b8b829970716431c34e4e09fc':
  Remove non-words from the French dictionary.
2012-05-24 03:33:18 -07:00
Jean Chalard
9b98c4a8ce am 69897af2: Merge "Add new locales for the spell checker." into jb-dev
* commit '69897af20db8fc0cb7cbf3d218cc1760ee200c43':
  Add new locales for the spell checker.
2012-05-24 03:33:16 -07:00
Tadashi G. Takaoka
f11c8cd15a Merge "Get rid of heavy IPC call from key drawing code" into jb-dev 2012-05-24 03:24:13 -07:00
Jean Chalard
28d82a3ad3 Merge "Remove non-words from the French dictionary." into jb-dev 2012-05-24 03:14:35 -07:00
Jean Chalard
69897af20d Merge "Add new locales for the spell checker." into jb-dev 2012-05-24 03:13:56 -07:00
Tadashi G. Takaoka
fd60b2f970 Get rid of heavy IPC call from key drawing code
Bug: 6541544
Change-Id: I5c7df486ff72714ae09e1dbc21a8adbe3106ce95
2012-05-24 19:04:49 +09:00
Jean Chalard
d527a15ec4 Add new locales for the spell checker.
Bug: 6533167
Change-Id: I1581e8446b1af5dc3679e01be16d4fc34af725cc
2012-05-24 18:45:58 +09:00
Tadashi G. Takaoka
fe36e7fd9b am 9c239184: am 49afe45d: Fix build
* commit '9c239184530be37fa806cf37a4f19ae0bc824aec':
  Fix build
2012-05-24 01:21:38 -07:00
Tadashi G. Takaoka
9c23918453 am 49afe45d: Fix build
* commit '49afe45d8ea09dd51bbe27f10b0210adf37cdb3f':
  Fix build
2012-05-24 01:18:44 -07:00
Jean Chalard
b2acdba809 Remove non-words from the French dictionary.
Change-Id: I98c546818aa456a534e833495deb670e79df4104
2012-05-24 17:16:41 +09:00
Tadashi G. Takaoka
49afe45d8e Fix build
Follow up of I7822adf407

Change-Id: Iac75c0f2ff2482bce1305c54cb25b708037db6c6
2012-05-24 17:13:35 +09:00
Tadashi G. Takaoka
516b785ce0 am bc48a8f7: am c60a846e: Fix NPE in Settings.updateCustomInputStylesSummary
* commit 'bc48a8f7ab0d9003a9c97ceb7d85bcf0502785a6':
  Fix NPE in Settings.updateCustomInputStylesSummary
2012-05-24 00:50:37 -07:00
Tadashi G. Takaoka
bc48a8f7ab am c60a846e: Fix NPE in Settings.updateCustomInputStylesSummary
* commit 'c60a846e219ead1a40307d1a562013c38ea81b9d':
  Fix NPE in Settings.updateCustomInputStylesSummary
2012-05-24 00:48:35 -07:00
Tadashi G. Takaoka
c60a846e21 Fix NPE in Settings.updateCustomInputStylesSummary
Change-Id: I7822adf407046098f97bf60da9382910c0a40209
2012-05-24 16:43:13 +09:00
satok
8822d5a346 am 60b2d84d: am 1e1235fe: Merge "Support bigram suggestions in Android spell checker" into jb-dev
* commit '60b2d84d82ce8fd4a7bf4592d5229ee2436a675c':
  Support bigram suggestions in Android spell checker
2012-05-23 22:07:06 -07:00
satok
60b2d84d82 am 1e1235fe: Merge "Support bigram suggestions in Android spell checker" into jb-dev
* commit '1e1235feeb5454dc8dd76d68dbf634b35d2d20f2':
  Support bigram suggestions in Android spell checker
2012-05-23 22:05:00 -07:00
satok
1e1235feeb Merge "Support bigram suggestions in Android spell checker" into jb-dev 2012-05-23 22:02:52 -07:00
satok
315d731d8f Support bigram suggestions in Android spell checker
Bug: 6136291
Change-Id: Ic278153f95b23e9aa180d1d6b5960785766d96e5
2012-05-24 12:27:33 +09:00
Ken Wakasa
c28e7e360a am 7d81f318: am 7b1570e6: Merge "Cleanup Makefiles of LatinIME" into jb-dev
* commit '7d81f3187198b1589edab3c7883c3ee94855ed7e':
  Cleanup Makefiles of LatinIME
2012-05-23 20:23:35 -07:00
Ken Wakasa
7d81f31871 am 7b1570e6: Merge "Cleanup Makefiles of LatinIME" into jb-dev
* commit '7b1570e60c2e04fe7d132df758476b34685eb709':
  Cleanup Makefiles of LatinIME
2012-05-23 20:22:04 -07:00
Ken Wakasa
7b1570e60c Merge "Cleanup Makefiles of LatinIME" into jb-dev 2012-05-23 20:20:23 -07:00
satok
6d6c070eba am 925212ff: am c54d558e: Cancel adding user history bigram when autocorrection is cancelled
* commit '925212ff4b3d6ff4182a94a133c0e4a4f23dd6aa':
  Cancel adding user history bigram when autocorrection is cancelled
2012-05-23 20:19:46 -07:00
satok
925212ff4b am c54d558e: Cancel adding user history bigram when autocorrection is cancelled
* commit 'c54d558e2e70bdfb2c1078cae7b88440d421dc67':
  Cancel adding user history bigram when autocorrection is cancelled
2012-05-23 20:17:10 -07:00
satok
c54d558e2e Cancel adding user history bigram when autocorrection is cancelled
Bug: 6465474
Change-Id: Ifbfe0ddc2ce5fab070939ede3db7bf03a8535a45
2012-05-24 12:11:02 +09:00
Ken Wakasa
dd58065733 Cleanup Makefiles of LatinIME
Change-Id: Id4c6700bc045825eb64fb2b7ae57f23a6211441d
2012-05-24 12:08:59 +09:00
The Android Automerger
13213ae065 merge in jb-release history after reset to jb-dev 2012-05-23 07:04:31 -07:00
satok
76e73c0c90 am 074e8c92: am a0ac31fc: Fix the issue on multiple words suggestion
* commit '074e8c920683d77fae191b34185193c896e3aa00':
  Fix the issue on multiple words suggestion
2012-05-23 05:10:19 -07:00
satok
074e8c9206 am a0ac31fc: Fix the issue on multiple words suggestion
* commit 'a0ac31fcaa01c21592a6e7af243c14dada65cf3e':
  Fix the issue on multiple words suggestion
2012-05-23 05:06:08 -07:00
Jean Chalard
bf52a18806 am a6f86554: am 0b6b6ee5: Merge "Notify the dictionary pack about copy failures" into jb-dev
* commit 'a6f865541bb1f0db7d179d77d6c4fe10a22dc109':
  Notify the dictionary pack about copy failures
2012-05-23 04:42:35 -07:00
satok
a0ac31fcaa Fix the issue on multiple words suggestion
Bug: 6509844
Change-Id: I823074a2b29befc3e60c63699ab4dc7719105c63
2012-05-23 20:40:59 +09:00
Jean Chalard
a6f865541b am 0b6b6ee5: Merge "Notify the dictionary pack about copy failures" into jb-dev
* commit '0b6b6ee542c0e143868538acdf5b161013c0b1de':
  Notify the dictionary pack about copy failures
2012-05-23 04:39:38 -07:00
Jean Chalard
0b6b6ee542 Merge "Notify the dictionary pack about copy failures" into jb-dev 2012-05-23 04:12:59 -07:00
Tadashi G. Takaoka
0a4924518b am 09abb2c7: am 2866da88: Make ProximityInfo copy constructor for test
* commit '09abb2c7de0828c0ec8ee58a442722fbfdf628f5':
  Make ProximityInfo copy constructor for test
2012-05-23 02:54:57 -07:00
Tadashi G. Takaoka
09abb2c7de am 2866da88: Make ProximityInfo copy constructor for test
* commit '2866da88a781c501c6f83cfd91eca0d95e25f6e5':
  Make ProximityInfo copy constructor for test
2012-05-23 02:50:41 -07:00
Jean Chalard
3abac7e28e Notify the dictionary pack about copy failures
Bug: 6532896
Change-Id: I57f7b1a400222c89776f9bff652a7da4470232c5
2012-05-23 18:46:51 +09:00
Tadashi G. Takaoka
2866da88a7 Make ProximityInfo copy constructor for test
Change-Id: I94a29784591208af1849d4941a3b4789b93782de
2012-05-23 17:45:19 +09:00
Tadashi G. Takaoka
ced9f4e385 am 0673e941: am 4cba9f58: Merge "Remove unused private method Suggest.searchBigramSuggestion" into jb-dev
* commit '0673e941eb26b491f53bbbb2bbdc49bfd07ff973':
  Remove unused private method Suggest.searchBigramSuggestion
2012-05-23 00:22:20 -07:00
Tadashi G. Takaoka
0673e941eb am 4cba9f58: Merge "Remove unused private method Suggest.searchBigramSuggestion" into jb-dev
* commit '4cba9f58d46e390ccdff0450cd4bf7be1d106b5a':
  Remove unused private method Suggest.searchBigramSuggestion
2012-05-23 00:20:09 -07:00
Tadashi G. Takaoka
4cba9f58d4 Merge "Remove unused private method Suggest.searchBigramSuggestion" into jb-dev 2012-05-23 00:17:25 -07:00