Jean Chalard
082baf6172
am 4de3bc30
: am a0cd0584
: Merge "Preemptive anti-deadlock device" into jb-mr1-dev
...
* commit '4de3bc305bd817aec0d9c413a3cf1f79bff3b160':
Preemptive anti-deadlock device
2012-08-14 01:12:30 -07: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
daf3759fb3
am 26707d39
: am d832bec4
: Merge "Step 26-A Cleanup geometory_utils" into jb-mr1-dev
...
* commit '26707d3908cdfc3e3d27a999cc6d0d251ee100e7':
Step 26-A Cleanup geometory_utils
2012-08-13 23:41:36 -07: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
9ecec4eb5c
am a9552f8f
: am 5d6b8e18
: Fix a bug that would prevent spell checking
...
* commit 'a9552f8f0233c04dd5237c35027f309e6ec0b6f9':
Fix a bug that would prevent spell checking
2012-08-13 22:56:35 -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
c1a06e1d77
am 78028cb6
: (-s ours) am 0aeb4c20
: Import translations. DO NOT MERGE
...
* commit '78028cb6e04be92bb062d02ca94f73d6b3c96d65':
Import translations. DO NOT MERGE
2012-08-13 15:41:20 -07: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
bdea4a0c88
Import translations. DO NOT MERGE
...
Change-Id: I5d7f7487291f5a0cd054ab8db0c5a891900fec6a
Auto-generated-cl: translation import
2012-08-13 14:11:40 -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
5672b2d597
am 7851af20
: am 8c12bd87
: Merge "Tag the whitelisted entries in native code." into jb-mr1-dev
...
* commit '7851af201ef517142771c49041b0771ca9bbe275':
Tag the whitelisted entries in native code.
2012-08-13 03:28:35 -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
4d9d1e50c8
am 322f2a80
: am f92f9de7
: Merge "Eliminate redundant time parameter from gesture detection code" into jb-mr1-dev
...
* commit '322f2a80b88d2ec05792b09a60cbcd3583ae8c26':
Eliminate redundant time parameter from gesture detection code
2012-08-13 02:29:37 -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
ed340b99db
am 9e3d8722
: am 40a6d4af
: Merge "Cleanups in geometry_utils.h" into jb-mr1-dev
...
* commit '9e3d8722a8ecd519786e26cba331519a89d02ebb':
Cleanups in geometry_utils.h
2012-08-13 02:15:29 -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
5b8ab8e481
am 9d7924dc
: am f5fba0c1
: Merge "Remove unnecessary drawing point" into jb-mr1-dev
...
* commit '9d7924dc82291f8180a947c905b66e3bd8039ff4':
Remove unnecessary drawing point
2012-08-13 02:10:52 -07: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
1ea7108c5e
am 8db85a41
: am f144cc61
: Merge "Step 24-A remove setdict" into jb-mr1-dev
...
* commit '8db85a419eb2235c97e1fb3a9e38ca0024042df1':
Step 24-A remove setdict
2012-08-13 00:23:36 -07:00
Jean Chalard
10770b3a92
am 85ed27c9
: am 2d0cd582
: Merge "Remove useless backslashes from the whitelist dictionary" into jb-mr1-dev
...
* commit '85ed27c9dd54af46c7cc6101a9caab17a5212e9a':
Remove useless backslashes from the whitelist dictionary
2012-08-13 00:22:03 -07: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
Jean Chalard
2d0cd582c2
Merge "Remove useless backslashes from the whitelist dictionary" into jb-mr1-dev
2012-08-13 00:18:01 -07:00
Jean Chalard
c278142745
Remove useless backslashes from the whitelist dictionary
...
For some reason, these are necessary for resources, but XML
standard does not require them.
Change-Id: I7cdaecb6815aa4020e0d453e33be38ff2968df50
2012-08-13 15:53:07 +09:00
Satoshi Kataoka
ddb12ea63a
Step 24-A remove setdict
...
Change-Id: Iab28bf0fd785b9e81fc86837e64a1ef2e315a229
2012-08-13 14:32:17 +09:00
Tadashi G. Takaoka
fc5e3f973c
Remove unnecessary drawing point
...
Change-Id: Ib9cba3484a72306320eb9c1744d940da1a0998c7
2012-08-13 14:03:10 +09:00
Tadashi G. Takaoka
a3c86d4aac
am 6b5f5bb2
: am 708cc94a
: Remove gesture detection hacking code
...
* commit '6b5f5bb22710e15ecfd4d3ecbc955b7a8236c85d':
Remove gesture detection hacking code
2012-08-12 20:46:11 -07:00
Tadashi G. Takaoka
6b5f5bb227
am 708cc94a
: Remove gesture detection hacking code
...
* commit '708cc94a354ad96294126a6ba954bf8be5bd5a06':
Remove gesture detection hacking code
2012-08-12 20:44:41 -07:00
Tadashi G. Takaoka
708cc94a35
Remove gesture detection hacking code
...
Change-Id: Idaec3753592ca0a5c5545eb5ab65254a3e32e662
2012-08-13 12:19:19 +09:00
Ken Wakasa
7127873b9b
am 8e1f9153
: am 507113a1
: Fix typo in include guard macro, and some cleanups.
...
* commit '8e1f91538537e5a23806c163d4fa01aed7423ee8':
Fix typo in include guard macro, and some cleanups.
2012-08-12 19:58:13 -07:00
Ken Wakasa
8e1f915385
am 507113a1
: Fix typo in include guard macro, and some cleanups.
...
* commit '507113a1bb0d9b7ac333512a69da12c4d5d57182':
Fix typo in include guard macro, and some cleanups.
2012-08-12 19:56:28 -07:00
Ken Wakasa
507113a1bb
Fix typo in include guard macro, and some cleanups.
...
Change-Id: I455f6a52667b1c6ae5eb9f58b3494dd87eb2c3f5
2012-08-13 11:51:37 +09:00
Ken Wakasa
aa9063a1f4
am 7b4531a1
: am bcec82de
: Clean up constructors
...
* commit '7b4531a16f0d7f237822e94f3e962257ee9d0c16':
Clean up constructors
2012-08-12 19:09:24 -07:00
Ken Wakasa
7b4531a16f
am bcec82de
: Clean up constructors
...
* commit 'bcec82de66f52655593dc233346f11468f5077a0':
Clean up constructors
2012-08-12 19:07:44 -07:00
Ken Wakasa
bcec82de66
Clean up constructors
...
And, use C++ style casts and use float math functions rather than double ones to save memory space.
Also, stop using FloatMath and NativeUtils as standard Math methods are faster now.
See http://code.google.com/p/android/issues/detail?id=36199 and https://android-review.googlesource.com/40700
multi-project commit with I4259fb5ab8a15ac5760a7f04fc8f4c860529f04a
Change-Id: I0b81cff8c91769f7559a59b9528c75a5aabb4211
2012-08-13 10:48:37 +09:00
satok
078a0028d6
am f9b2841f
: am 81451030
: Merge "Fix JNI" into jb-mr1-dev
...
* commit 'f9b2841fb592778ad34b5181e1c0bcbf551e3632':
Fix JNI
2012-08-12 18:32:43 -07:00