The Android Open Source Project
7394616600
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3f51f6d0028015c72222250ba7521bbb169f4f7c
2012-08-15 08:28:51 -07:00
The Android Automerger
610331e25c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:35:03 -07:00
Satoshi Kataoka
e6e64e11d4
am 4bf2c070: Merge "Step 30-A Constize gesture" into jb-mr1-dev
...
* commit '4bf2c0703440a0c668ec071c36e82dd02d5caf30':
Step 30-A Constize gesture
2012-08-15 02:41:02 -07:00
Satoshi Kataoka
4bf2c07034
Merge "Step 30-A Constize gesture" into jb-mr1-dev
2012-08-15 02:39:32 -07:00
Jean Chalard
e3884b041d
am 91c64902: Merge "Refresh editor info when the text field attributes changes." into jb-mr1-dev
...
* commit '91c64902b038976ae44d69dae7818f2c7adde863':
Refresh editor info when the text field attributes changes.
2012-08-15 02:37:21 -07:00
Jean Chalard
91c64902b0
Merge "Refresh editor info when the text field attributes changes." into jb-mr1-dev
2012-08-15 02:35:21 -07:00
Jean Chalard
e234aed428
Refresh editor info when the text field attributes changes.
...
For some reason we get a "restarting" flag from the browser
some times when the input field is different. The attributes
however are not the same, so we can detect that and reload
appropriately.
Bug: 6946793
Change-Id: I6762dae6f41db690497b026a707d9cc89c840b34
2012-08-15 18:32:59 +09:00
Jean Chalard
5252ca773f
am cd0e0048: Merge "Ensure #offer always actually offers something." into jb-mr1-dev
...
* commit 'cd0e0048881eb854a4d1524c2d54d6b9bb00f614':
Ensure #offer always actually offers something.
2012-08-15 02:17:54 -07:00
Jean Chalard
cd0e004888
Merge "Ensure #offer always actually offers something." into jb-mr1-dev
2012-08-15 02:16:09 -07:00
Jean Chalard
653dbfb8ed
Ensure #offer always actually offers something.
...
This will allow remaining requests after a call to terminate
correctly.
Bug: 6963142
Change-Id: Iff67058bb8a39f2f1b468d3894861e8125de6659
2012-08-15 18:10:10 +09:00
Satoshi Kataoka
f6be15cffe
Step 30-A Constize gesture
...
Change-Id: I6c0b89d96532dc1c8ca71bb730ba22de5592ec67
2012-08-15 17:21:53 +09:00
Satoshi Kataoka
258eaa48b4
am 3979f060: Step 28-A Introduce the session Id to getSuggestion
...
* commit '3979f060f0650cbc117eee0307d05fb0be78c6f2':
Step 28-A Introduce the session Id to getSuggestion
2012-08-14 23:47:10 -07:00
Satoshi Kataoka
3979f060f0
Step 28-A Introduce the session Id to getSuggestion
...
Change-Id: I39d9bf1a7c272eb16d6ed4698f52457579b40f10
2012-08-15 15:44:45 +09:00
alanv
641373b735
am 05384933: Fix the build.
...
* commit '05384933097c1e9c35e8be5c03757d072e5ffa46':
Fix the build.
2012-08-14 15:49:28 -07:00
alanv
0538493309
Fix the build.
...
Change-Id: I744f6232e81981ab694d3d1e92bab5fd6efa46c0
2012-08-14 15:34:29 -07:00
Charles Chen
af0a088446
am dd7f7909: Merge "Change accessibility event type for app-driven speech." into jb-mr1-dev
...
* commit 'dd7f79097af10aa448ec10128f261cbadf4842ac':
Change accessibility event type for app-driven speech.
2012-08-14 14:36:18 -07:00
Charles Chen
dd7f79097a
Merge "Change accessibility event type for app-driven speech." into jb-mr1-dev
2012-08-14 14:33:32 -07:00
Ying Wang
82b201eaff
am 50eadf79: Retire LOCAL_NDK_VERSION.
...
* commit '50eadf798535cee9dd367ad0faf583938356ff40':
Retire LOCAL_NDK_VERSION.
2012-08-14 12:17:24 -07:00
Ying Wang
50eadf7985
Retire LOCAL_NDK_VERSION.
...
Bug: 6932421
Change-Id: I6cb8cdb3869c9c1c3d908f9c182e6f634ae76322
2012-08-14 12:07:28 -07:00
The Android Automerger
c639e6d396
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-14 07:08:02 -07:00
Ken Wakasa
822139bdf4
am 267030dd: Cleanup casts.
...
* commit '267030dd82a6165ca56899d2988b5dc51ebea104':
Cleanup casts.
2012-08-14 03:16:27 -07:00
Ken Wakasa
267030dd82
Cleanup casts.
...
Change-Id: I3bf33ca407cc3bee9f5c4c6f929cdb1421b92c50
2012-08-14 19:03:09 +09:00
Ken Wakasa
6c2c1a04f1
am 54035065: Merge "A couple of cleanups. Remove unnecessary casts." into jb-mr1-dev
...
* commit '54035065c0ba516af408b1a3e12e12b1483ed61a':
A couple of cleanups. Remove unnecessary casts.
2012-08-14 02:20:11 -07:00
Ken Wakasa
54035065c0
Merge "A couple of cleanups. Remove unnecessary casts." into jb-mr1-dev
2012-08-14 02:18:26 -07:00
Ken Wakasa
34710b03e6
A couple of cleanups. Remove unnecessary casts.
...
Change-Id: Ice530aa83a9a688da35aec408be2a60242699157
2012-08-14 18:07:32 +09:00
Jean Chalard
4de3bc305b
am a0cd0584: Merge "Preemptive anti-deadlock device" into jb-mr1-dev
...
* commit 'a0cd05842e26e802121823a25274190f65a2450f':
Preemptive anti-deadlock device
2012-08-14 01:11:22 -07:00
Jean Chalard
a0cd05842e
Merge "Preemptive anti-deadlock device" into jb-mr1-dev
2012-08-14 01:09:34 -07:00
Jean Chalard
e30c05800f
Preemptive anti-deadlock device
...
We don't know of any actual bug in the implementation of the
pool that may result in a deadlock, but this still implements
a means out of a deadlock if one ever arises anyway. It's
meant to improve the resilience of the spell checker.
Bug: 5441027
Change-Id: I689491090792dbb89110ee56631965c5bb2dc712
2012-08-14 17:04:14 +09:00
Satoshi Kataoka
26707d3908
am d832bec4: Merge "Step 26-A Cleanup geometory_utils" into jb-mr1-dev
...
* commit 'd832bec40be958a55a422a5c3a69c2504ef78a4e':
Step 26-A Cleanup geometory_utils
2012-08-13 23:40:19 -07:00
Satoshi Kataoka
d832bec40b
Merge "Step 26-A Cleanup geometory_utils" into jb-mr1-dev
2012-08-13 23:37:50 -07:00
Jean Chalard
a9552f8f02
am 5d6b8e18: Fix a bug that would prevent spell checking
...
* commit '5d6b8e181811e10b38dd30f4ba33757bb2162552':
Fix a bug that would prevent spell checking
2012-08-13 22:55:13 -07:00
Jean Chalard
5d6b8e1818
Fix a bug that would prevent spell checking
...
java.lang.ArrayIndexOutOfBoundsException:
[I offset=0 length=528 src.length=512
com.android.inputmethod.keyboard.ProximityInfo
.setProximityInfoNative(Native Method)
com.android.inputmethod.keyboard.ProximityInfo
.createSpellCheckerProximityInfo(ProximityInfo.java:85)
com.android.inputmethod.latin.spellcheck.AndroidSpellCheckerService
.createDictAndProximity(AndroidSpellCheckerService.java:411)
The array was too small with respect with the passed size.
Change-Id: I7777d7aecd17375d3fbf82854a66eb7a5a289ce6
2012-08-14 14:45:17 +09:00
Baligh Uddin
78028cb6e0
am 0aeb4c20: Import translations. DO NOT MERGE
...
* commit '0aeb4c206c9d9d30d9b49dcc4a742130ba4f1da7':
Import translations. DO NOT MERGE
2012-08-13 15:40:09 -07:00
Baligh Uddin
0aeb4c206c
Import translations. DO NOT MERGE
...
Change-Id: I36bb28cfdf548a38bfdd3127ddafa6c7d938376e
Auto-generated-cl: translation import
2012-08-13 14:05:29 -07:00
Satoshi Kataoka
e7398cdb2b
Step 26-A Cleanup geometory_utils
...
Change-Id: I839c498c85009a5d6428a71f121a2906fd667db8
2012-08-14 03:39:14 +09:00
The Android Automerger
1983097eee
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-13 08:10:16 -07:00
Jean Chalard
7851af201e
am 8c12bd87: Merge "Tag the whitelisted entries in native code." into jb-mr1-dev
...
* commit '8c12bd87ccd649732a40cf6aae36e82e92e2edb4':
Tag the whitelisted entries in native code.
2012-08-13 03:27:20 -07:00
Jean Chalard
8c12bd87cc
Merge "Tag the whitelisted entries in native code." into jb-mr1-dev
2012-08-13 03:24:47 -07:00
Tadashi G. Takaoka
322f2a80b8
am f92f9de7: Merge "Eliminate redundant time parameter from gesture detection code" into jb-mr1-dev
...
* commit 'f92f9de7a9c8b89a825780d92e984a659c901568':
Eliminate redundant time parameter from gesture detection code
2012-08-13 02:27:13 -07:00
Tadashi G. Takaoka
f92f9de7a9
Merge "Eliminate redundant time parameter from gesture detection code" into jb-mr1-dev
2012-08-13 02:25:28 -07:00
Ken Wakasa
9e3d8722a8
am 40a6d4af: Merge "Cleanups in geometry_utils.h" into jb-mr1-dev
...
* commit '40a6d4af2a454323601c2c5ff8d95863eefedd86':
Cleanups in geometry_utils.h
2012-08-13 02:13:08 -07:00
Ken Wakasa
40a6d4af2a
Merge "Cleanups in geometry_utils.h" into jb-mr1-dev
2012-08-13 02:11:52 -07:00
Tadashi G. Takaoka
74d0bb09c7
Eliminate redundant time parameter from gesture detection code
...
This change also uses the key width to determine the sampling rate of
the gesture points (instead of the key height).
Change-Id: I987487825693b4883d8359eb5b31f1d668cd5ef4
2012-08-13 18:11:03 +09:00
Tadashi G. Takaoka
9d7924dc82
am f5fba0c1: Merge "Remove unnecessary drawing point" into jb-mr1-dev
...
* commit 'f5fba0c1f095266aa1cc084917d06f66e4b23009':
Remove unnecessary drawing point
2012-08-13 02:08:26 -07:00
Tadashi G. Takaoka
f5fba0c1f0
Merge "Remove unnecessary drawing point" into jb-mr1-dev
2012-08-13 02:06:42 -07:00
Ken Wakasa
0fb950858e
Cleanups in geometry_utils.h
...
Change-Id: Ic051703e5b67adfc62753ebd9ab254296719c6e9
2012-08-13 17:47:00 +09:00
Jean Chalard
b14fc88e48
Tag the whitelisted entries in native code.
...
Since this is already used in Java land, this actually does
activate the whitelist path, and the code is now fully
functional. We still have to remove the old whitelist resource
and to compile the dictionary that includes the whitelist.
Bug: 6906525
Change-Id: Iacde5313e303b9ed792940efaf6bcfa4ee1317bd
2012-08-13 16:35:59 +09:00
Satoshi Kataoka
8db85a419e
am f144cc61: Merge "Step 24-A remove setdict" into jb-mr1-dev
...
* commit 'f144cc61cc9b704f890ad703c5220c3eed891743':
Step 24-A remove setdict
2012-08-13 00:21:50 -07:00
Jean Chalard
85ed27c9dd
am 2d0cd582: Merge "Remove useless backslashes from the whitelist dictionary" into jb-mr1-dev
...
* commit '2d0cd582c26640d457fe4db3ab3a510894a99471':
Remove useless backslashes from the whitelist dictionary
2012-08-13 00:20:14 -07:00
Satoshi Kataoka
f144cc61cc
Merge "Step 24-A remove setdict" into jb-mr1-dev
2012-08-13 00:20:12 -07:00