The Android Open Source Project
ea1711b343
am af109108
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'af109108641f2169df77533892f651ed31d32a4e':
2012-08-10 08:55:58 -07:00
The Android Open Source Project
af10910864
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2d5f51a53ca7d84e5de661ce92fd9a83814b7eae
2012-08-10 08:54:08 -07:00
Ken Wakasa
4ff0bccbe8
am ec1e373a
: am 063c3e21
: Fix memset() bugs
...
* commit 'ec1e373a20e961d18dfd68db6b58c97c4da4176b':
Fix memset() bugs
2012-08-10 06:23:32 -07:00
Ken Wakasa
ec1e373a20
am 063c3e21
: Fix memset() bugs
...
* commit '063c3e2171e546957d8c40575740c29f234e307c':
Fix memset() bugs
2012-08-10 06:21:31 -07:00
Ken Wakasa
063c3e2171
Fix memset() bugs
...
Change-Id: Icf4341c0a62e782cf8c2a863408591df4e6f07cb
2012-08-10 22:13:21 +09:00
Ken Wakasa
be03370d1e
am caa197d7
: am f3850e55
: Use JNI Region calls also in getSuggestions()
...
* commit 'caa197d76f8eb27dbb4fa400bace4db625b930bd':
Use JNI Region calls also in getSuggestions()
2012-08-10 05:17:45 -07:00
Ken Wakasa
caa197d76f
am f3850e55
: Use JNI Region calls also in getSuggestions()
...
* commit 'f3850e554389dc3012584f9d81a4f2d3d4c89e44':
Use JNI Region calls also in getSuggestions()
2012-08-10 05:16:42 -07:00
Satoshi Kataoka
0914ba8a53
am f85ec408
: am f6c22008
: Workaround to stop init dict traverse session
...
* commit 'f85ec4082f60d4b7a06d907505938d91b3dfcee5':
Workaround to stop init dict traverse session
2012-08-10 05:09:48 -07:00
Ken Wakasa
f3850e5543
Use JNI Region calls also in getSuggestions()
...
Change-Id: I9cc0208397c202aeb6f7b5bb5ad59e00c5afbd80
2012-08-10 21:09:23 +09:00
Satoshi Kataoka
f6c2200890
Workaround to stop init dict traverse session
...
Change-Id: I3d46c54a96a9fc0359ef75b9d2f8590b44164a8b
2012-08-10 21:07:53 +09:00
Satoshi Kataoka
f85ec4082f
am f6c22008
: Workaround to stop init dict traverse session
...
* commit 'f6c2200890012708709964fb1a8933ed1c3e7dd8':
Workaround to stop init dict traverse session
2012-08-10 05:07:52 -07:00
Satoshi Kataoka
fc6433facb
am 5d9d69d2
: am 0f4de30e
: Fix a bug on jni of DicTraverseSession
...
* commit '5d9d69d2f1e3a81d020cc782dcb02cb7ec994dd0':
Fix a bug on jni of DicTraverseSession
2012-08-10 04:58:01 -07:00
Satoshi Kataoka
5d9d69d2f1
am 0f4de30e
: Fix a bug on jni of DicTraverseSession
...
* commit '0f4de30e589deba221b92b3bde341c54fd9d1b9d':
Fix a bug on jni of DicTraverseSession
2012-08-10 04:56:07 -07:00
Satoshi Kataoka
0f4de30e58
Fix a bug on jni of DicTraverseSession
...
Change-Id: Ieeac36cbad9a99d15911f2e6e2e841cae38ecb9b
2012-08-10 20:13:57 +09:00
Satoshi Kataoka
96da9904cc
am 117f022f
: am 82bd0c1e
: Merge "step 23-A remove unused method" into jb-mr1-dev
...
* commit '117f022f96f84c39c99cbf0821a220052026ddc4':
step 23-A remove unused method
2012-08-10 03:50:06 -07:00
Satoshi Kataoka
117f022f96
am 82bd0c1e
: Merge "step 23-A remove unused method" into jb-mr1-dev
...
* commit '82bd0c1e9da5b4872379ffd2875f4ef6e14dc66c':
step 23-A remove unused method
2012-08-10 03:48:04 -07:00
Satoshi Kataoka
82bd0c1e9d
Merge "step 23-A remove unused method" into jb-mr1-dev
2012-08-10 03:45:34 -07:00
Satoshi Kataoka
88dfeb30bf
step 23-A remove unused method
...
Change-Id: I382c654fd30aca1a3277a186ee25fc946449c639
2012-08-10 19:35:04 +09:00
Jean Chalard
9e49160687
am 407d23ad
: am a5e57d67
: Merge "Accept whitelisted entries from any source." into jb-mr1-dev
...
* commit '407d23ad246cb55e8e6a0138ca39d4d105c5b0a0':
Accept whitelisted entries from any source.
2012-08-10 03:21:12 -07:00
Jean Chalard
225659a7ec
am b5cb4447
: am 58040e7d
: Merge "Optimization & Simplification" into jb-mr1-dev
...
* commit 'b5cb4447cfbc7d397f4da7d3753431bc97ee445e':
Optimization & Simplification
2012-08-10 03:21:11 -07:00
Jean Chalard
407d23ad24
am a5e57d67
: Merge "Accept whitelisted entries from any source." into jb-mr1-dev
...
* commit 'a5e57d6755c41d8161bd2de3b76cca6922d61202':
Accept whitelisted entries from any source.
2012-08-10 03:19:08 -07:00
Jean Chalard
b5cb4447cf
am 58040e7d
: Merge "Optimization & Simplification" into jb-mr1-dev
...
* commit '58040e7df9bd22274f9b41c9d8435140be83d586':
Optimization & Simplification
2012-08-10 03:19:07 -07:00
Jean Chalard
a5e57d6755
Merge "Accept whitelisted entries from any source." into jb-mr1-dev
2012-08-10 03:17:55 -07:00
Jean Chalard
58040e7df9
Merge "Optimization & Simplification" into jb-mr1-dev
2012-08-10 03:17:30 -07:00
Jean Chalard
7b258e512d
Accept whitelisted entries from any source.
...
...not only the WhitelistDictionary.
Bug: 6906525
Change-Id: I7f181eb6936ec17bbccdc4e736fd09292af24e9c
2012-08-10 19:02:19 +09:00
Jean Chalard
caed149b67
Optimization & Simplification
...
It's useless to do the whitelist lookup twice. Also, putting
this test out of this method will allow whitelist entries to
come from other sources.
Bug: 6906525
Change-Id: I4afe678cae6556d16642d155ce770fbf4e61ad49
2012-08-10 19:02:15 +09:00
Satoshi Kataoka
e0b0813f5e
am d7001b42
: am c14d55a2
: Merge "Step 22-A implement session" into jb-mr1-dev
...
* commit 'd7001b4220bde3bc3a75a46aec470e897ad1c754':
Step 22-A implement session
2012-08-10 02:09:31 -07:00
Satoshi Kataoka
d7001b4220
am c14d55a2
: Merge "Step 22-A implement session" into jb-mr1-dev
...
* commit 'c14d55a28915383aa82339f423e45bef057bcadf':
Step 22-A implement session
2012-08-10 02:07:15 -07:00
Satoshi Kataoka
c14d55a289
Merge "Step 22-A implement session" into jb-mr1-dev
2012-08-10 02:06:05 -07:00
Satoshi Kataoka
6b4a1d79eb
Step 22-A implement session
...
Change-Id: Ida63382ffb756e20cc5b17c2702d2895e7e6e889
2012-08-10 18:06:04 +09:00
Jean Chalard
fdbc75e5d4
am 1599feda
: am dc2fb6bc
: Merge "Pass the type from native code all the way to Java." into jb-mr1-dev
...
* commit '1599feda42e0f0881368b948222a0667a09de728':
Pass the type from native code all the way to Java.
2012-08-10 01:30:01 -07:00
Jean Chalard
1599feda42
am dc2fb6bc
: Merge "Pass the type from native code all the way to Java." into jb-mr1-dev
...
* commit 'dc2fb6bc6d0c071b8023d62291becf2e2d59535c':
Pass the type from native code all the way to Java.
2012-08-10 01:28:25 -07:00
Jean Chalard
dc2fb6bc6d
Merge "Pass the type from native code all the way to Java." into jb-mr1-dev
2012-08-10 01:26:59 -07:00
Jean Chalard
b2bcac76e9
am 36e2a3bd
: am 28f73ef3
: Merge "Reinstate putting shortcut-only entries in the dictionary" into jb-mr1-dev
...
* commit '36e2a3bd49cf87fe07c2ec04942adde33dbe69bf':
Reinstate putting shortcut-only entries in the dictionary
2012-08-10 01:17:00 -07:00
Jean Chalard
36e2a3bd49
am 28f73ef3
: Merge "Reinstate putting shortcut-only entries in the dictionary" into jb-mr1-dev
...
* commit '28f73ef3d9ba873624bb5b58f84f65b96628c877':
Reinstate putting shortcut-only entries in the dictionary
2012-08-10 01:15:37 -07:00
Jean Chalard
f3d676ccc5
am e1f6caa5
: am 7afbd127
: Merge "Add a shortcut-format version of the whitelist." into jb-mr1-dev
...
* commit 'e1f6caa533083311eed8d7cb6b69d803ae2072ec':
Add a shortcut-format version of the whitelist.
2012-08-10 01:15:30 -07:00
Jean Chalard
e1f6caa533
am 7afbd127
: Merge "Add a shortcut-format version of the whitelist." into jb-mr1-dev
...
* commit '7afbd12794e2a75f64c71cbe17e7dad544e52177':
Add a shortcut-format version of the whitelist.
2012-08-10 01:14:06 -07:00
Jean Chalard
28f73ef3d9
Merge "Reinstate putting shortcut-only entries in the dictionary" into jb-mr1-dev
2012-08-10 01:13:36 -07:00
Jean Chalard
7afbd12794
Merge "Add a shortcut-format version of the whitelist." into jb-mr1-dev
2012-08-10 01:12:22 -07:00
Jean Chalard
926ef06a1e
Pass the type from native code all the way to Java.
...
Bug: 6906525
Change-Id: I057390d47a223450e22d8338509e22c28fc0d5f6
2012-08-10 15:51:55 +09:00
Jean Chalard
565fdeee7d
Reinstate putting shortcut-only entries in the dictionary
...
Not sure at which point this functionality got lost, but
anyway, it's back
Bug: 6906525
Change-Id: Ie87baa0dacdcee90e029917ca866099593d5d048
2012-08-10 15:51:53 +09:00
Jean Chalard
1d8103ea57
Add a shortcut-format version of the whitelist.
...
This will ultimately replace the whitelist resource, but
this change doesn't delete it to avoid removing the functionality
temporarily.
Bug: 6906525
Change-Id: I576edc42cd2a964b86b7597f1ede1cf6ec8e26c3
2012-08-10 15:51:18 +09:00
Tadashi G. Takaoka
d66ed30b0b
am 7a9695e4
: am ce38c62a
: Merge "Remove conservative MainKeyboardView.draw" into jb-mr1-dev
...
* commit '7a9695e455d4cd5eeb509452eb58c06e5000cc03':
Remove conservative MainKeyboardView.draw
2012-08-09 23:35:50 -07:00
Tadashi G. Takaoka
7a9695e455
am ce38c62a
: Merge "Remove conservative MainKeyboardView.draw" into jb-mr1-dev
...
* commit 'ce38c62aef4c39eedc61de66a4e3f614db9c0faa':
Remove conservative MainKeyboardView.draw
2012-08-09 23:34:07 -07:00
Tadashi G. Takaoka
ce38c62aef
Merge "Remove conservative MainKeyboardView.draw" into jb-mr1-dev
2012-08-09 23:31:53 -07:00
Jean Chalard
70cb631e78
am 5536cbce
: am e6af6c2f
: Merge "Support a syntax to add whitelist entries in shortcuts" into jb-mr1-dev
...
* commit '5536cbce68da52c51bbfb1871d6c7a489ce27a29':
Support a syntax to add whitelist entries in shortcuts
2012-08-09 22:31:54 -07:00
Jean Chalard
5536cbce68
am e6af6c2f
: Merge "Support a syntax to add whitelist entries in shortcuts" into jb-mr1-dev
...
* commit 'e6af6c2f08ef22ffb0b6dcba5debd2a70e7b63ed':
Support a syntax to add whitelist entries in shortcuts
2012-08-09 22:29:57 -07:00
Jean Chalard
e6af6c2f08
Merge "Support a syntax to add whitelist entries in shortcuts" into jb-mr1-dev
2012-08-09 22:28:13 -07:00
Satoshi Kataoka
f775fcfba3
am ab45cc6e
: am e9f3e182
: Add arguments for dic traverse session
...
* commit 'ab45cc6e5c96bee7d020135639c66ba0322e3649':
Add arguments for dic traverse session
2012-08-09 20:56:43 -07:00
Satoshi Kataoka
ab45cc6e5c
am e9f3e182
: Add arguments for dic traverse session
...
* commit 'e9f3e182e4b3217282831fd8805958270b4dbba3':
Add arguments for dic traverse session
2012-08-09 20:54:37 -07:00