4fbdaacb20
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Idc407af8f1c35eec3901797e62283f15b5ca147a
2012-05-24 09:01:48 -07:00
433da6aa89
merge in jb-release history after reset to jb-dev
2012-05-24 07:02:09 -07:00
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
0c20714403
Merge "Fix a bug with a concurrent modification of a map." into jb-dev
2012-05-24 03:39:09 -07:00
1b06b59e28
Fix a bug with a concurrent modification of a map.
...
Bug: 6538848
Change-Id: I1a8422356d9909213e53cfdc8c5bcc12eb48f19d
2012-05-24 19:38:04 +09:00
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
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
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
f11c8cd15a
Merge "Get rid of heavy IPC call from key drawing code" into jb-dev
2012-05-24 03:24:13 -07:00
28d82a3ad3
Merge "Remove non-words from the French dictionary." into jb-dev
2012-05-24 03:14:35 -07:00
69897af20d
Merge "Add new locales for the spell checker." into jb-dev
2012-05-24 03:13:56 -07:00
fd60b2f970
Get rid of heavy IPC call from key drawing code
...
Bug: 6541544
Change-Id: I5c7df486ff72714ae09e1dbc21a8adbe3106ce95
2012-05-24 19:04:49 +09:00
d527a15ec4
Add new locales for the spell checker.
...
Bug: 6533167
Change-Id: I1581e8446b1af5dc3679e01be16d4fc34af725cc
2012-05-24 18:45:58 +09:00
9c23918453
am 49afe45d: Fix build
...
* commit '49afe45d8ea09dd51bbe27f10b0210adf37cdb3f':
Fix build
2012-05-24 01:18:44 -07:00
b2acdba809
Remove non-words from the French dictionary.
...
Change-Id: I98c546818aa456a534e833495deb670e79df4104
2012-05-24 17:16:41 +09:00
49afe45d8e
Fix build
...
Follow up of I7822adf407
Change-Id: Iac75c0f2ff2482bce1305c54cb25b708037db6c6
2012-05-24 17:13:35 +09:00
bc48a8f7ab
am c60a846e: Fix NPE in Settings.updateCustomInputStylesSummary
...
* commit 'c60a846e219ead1a40307d1a562013c38ea81b9d':
Fix NPE in Settings.updateCustomInputStylesSummary
2012-05-24 00:48:35 -07:00
c60a846e21
Fix NPE in Settings.updateCustomInputStylesSummary
...
Change-Id: I7822adf407046098f97bf60da9382910c0a40209
2012-05-24 16:43:13 +09:00
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
1e1235feeb
Merge "Support bigram suggestions in Android spell checker" into jb-dev
2012-05-23 22:02:52 -07:00
315d731d8f
Support bigram suggestions in Android spell checker
...
Bug: 6136291
Change-Id: Ic278153f95b23e9aa180d1d6b5960785766d96e5
2012-05-24 12:27:33 +09:00
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
7b1570e60c
Merge "Cleanup Makefiles of LatinIME" into jb-dev
2012-05-23 20:20:23 -07:00
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
c54d558e2e
Cancel adding user history bigram when autocorrection is cancelled
...
Bug: 6465474
Change-Id: Ifbfe0ddc2ce5fab070939ede3db7bf03a8535a45
2012-05-24 12:11:02 +09:00
dd58065733
Cleanup Makefiles of LatinIME
...
Change-Id: Id4c6700bc045825eb64fb2b7ae57f23a6211441d
2012-05-24 12:08:59 +09:00
13213ae065
merge in jb-release history after reset to jb-dev
2012-05-23 07:04:31 -07:00
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
a0ac31fcaa
Fix the issue on multiple words suggestion
...
Bug: 6509844
Change-Id: I823074a2b29befc3e60c63699ab4dc7719105c63
2012-05-23 20:40:59 +09:00
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
0b6b6ee542
Merge "Notify the dictionary pack about copy failures" into jb-dev
2012-05-23 04:12:59 -07:00
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
3abac7e28e
Notify the dictionary pack about copy failures
...
Bug: 6532896
Change-Id: I57f7b1a400222c89776f9bff652a7da4470232c5
2012-05-23 18:46:51 +09:00
2866da88a7
Make ProximityInfo copy constructor for test
...
Change-Id: I94a29784591208af1849d4941a3b4789b93782de
2012-05-23 17:45:19 +09:00
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
4cba9f58d4
Merge "Remove unused private method Suggest.searchBigramSuggestion" into jb-dev
2012-05-23 00:17:25 -07:00
41531cfb74
am ff4c037c: Merge "Remove an updated dictionary that changed locales" into jb-dev
...
* commit 'ff4c037c9dc3533bcaa131fd0405fb8aeea60af4':
Remove an updated dictionary that changed locales
2012-05-23 00:06:43 -07:00
ff4c037c9d
Merge "Remove an updated dictionary that changed locales" into jb-dev
2012-05-23 00:04:21 -07:00
b9e2bce95e
Remove an updated dictionary that changed locales
...
When a dictionary changes locale, we need to remove the file
that corresponds to the old version. It has a different path
than the new one, so we have to search for it explicitly.
Bug: 6540631
Change-Id: Ie9d63ba636651fe90f8fbb9627b7265ac7b34ccd
2012-05-23 15:59:49 +09:00
b5db270962
Remove unused private method Suggest.searchBigramSuggestion
...
Change-Id: I077c4c019676fefb8eac6042bd7db1b7ab33ca03
2012-05-23 15:32:48 +09:00
e0e7bba154
am 24ce3645: Merge "Fix RuntiomeException when no custom input style is defined" into jb-dev
...
* commit '24ce36458690b34e7315556094b6943003cc490e':
Fix RuntiomeException when no custom input style is defined
2012-05-22 23:14:53 -07:00
24ce364586
Merge "Fix RuntiomeException when no custom input style is defined" into jb-dev
2012-05-22 23:13:18 -07:00
d6e238fc33
Fix RuntiomeException when no custom input style is defined
...
Bug: 6524480
Change-Id: I6bceea9fe07095b9ff3ed25c5677a82fa5d4086a
2012-05-23 14:48:16 +09:00
c4f66d3233
am 6c034901: Fix an NPE
...
* commit '6c0349012eb0edad56b6b89defebb922bbddbb34':
Fix an NPE
2012-05-22 20:15:19 -07:00
6c0349012e
Fix an NPE
...
Bug: 6538761
Change-Id: Id85486ee93437cfec7db421d5c7f2d7980a7e32e
2012-05-23 12:05:36 +09:00
04046b7742
am 37f81cd6: Merge "Always use AccessibilityUtils to send events." into jb-dev
...
* commit '37f81cd6e9a10fbdb3a1a054c88a6b5d98fb0f88':
Always use AccessibilityUtils to send events.
2012-05-22 14:26:03 -07:00
37f81cd6e9
Merge "Always use AccessibilityUtils to send events." into jb-dev
2012-05-22 14:23:42 -07:00
d50a32b62a
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-22 13:25:57 -07:00
07163d3908
Reconcile with jb-release
...
Change-Id: Icde0484962a178e6e29ab17e487b76e9662bb94b
2012-05-22 13:06:58 -07:00
17dde6a5ae
merge in jb-release history after reset to jb-dev
2012-05-22 07:07:20 -07:00
The Android Open Source Project
The Android Automerger
Jean Chalard
Tadashi G. Takaoka
satok
Ken Wakasa
Svetoslav Ganov