Commit graph

9168 commits

Author SHA1 Message Date
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
Satoshi Kataoka
e9f3e182e4 Add arguments for dic traverse session
Change-Id: I8776ad528eeea9a5fc4dcf394ca13bb80c04fb6d
2012-08-10 12:34:00 +09:00
Jean Chalard
31b90a368f Support a syntax to add whitelist entries in shortcuts
Bug: 6906525
Change-Id: Ie33586c07973bf76e38390766175ba424d72d655
2012-08-10 11:26:40 +09:00
Tadashi G. Takaoka
1b6829b0e0 Remove conservative MainKeyboardView.draw
Change-Id: I52f58d1e013dfe1f1b0f8320cba903d3dbb4eabd
2012-08-10 11:02:41 +09:00
The Android Automerger
a2653a3404 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-09 09:30:00 -07:00
Ken Wakasa
7b03580340 am eab16a4a: am 5bb42062: Use more JNI Region calls
* commit 'eab16a4a4b7fd91072e5764d68b80455b981de54':
  Use more JNI Region calls
2012-08-09 09:10:23 -07:00
Ken Wakasa
eab16a4a4b am 5bb42062: Use more JNI Region calls
* commit '5bb420627520412a621121f5c21da123f6a4cb1c':
  Use more JNI Region calls
2012-08-09 09:09:21 -07:00
Ken Wakasa
5bb4206275 Use more JNI Region calls
Change-Id: I371db517ff4749c0b7e5bdb4362e6310c91a24dc
2012-08-10 00:46:20 +09:00
Ken Wakasa
fa41660453 am 0437c75d: am 04a89132: Use GetStringUTFRegion for filename
* commit '0437c75d18866a7bd7d08efb941f8f1dcdd409aa':
  Use GetStringUTFRegion for filename
2012-08-09 07:36:44 -07:00
Ken Wakasa
0437c75d18 am 04a89132: Use GetStringUTFRegion for filename
* commit '04a89132e939db174079d155e25714d7f616ca8b':
  Use GetStringUTFRegion for filename
2012-08-09 07:35:41 -07:00
Ken Wakasa
04a89132e9 Use GetStringUTFRegion for filename
Change-Id: I2e9ad092ccf4c23c1c6b71916c962994314d37b6
2012-08-09 23:27:58 +09:00
Ken Wakasa
86ef75cf79 am 56ac3bf1: am 9e0c711a: Stop using STL string in additional_proximity_chars
* commit '56ac3bf13d495d856e927bbeb0faafeaf2ee874e':
  Stop using STL string in additional_proximity_chars
2012-08-09 06:39:50 -07:00
Ken Wakasa
56ac3bf13d am 9e0c711a: Stop using STL string in additional_proximity_chars
* commit '9e0c711a6230af1db0753af401804c95e4bee69d':
  Stop using STL string in additional_proximity_chars
2012-08-09 06:37:47 -07:00
Ken Wakasa
9e0c711a62 Stop using STL string in additional_proximity_chars
Change-Id: Ic016fd5983b8855b0fd9506a17b205db86af3a2f
2012-08-09 22:28:57 +09:00
Ken Wakasa
80b3795383 am 3b530455: am 805ac949: Fix string.compare() logic. It happens to be working luckily.
* commit '3b53045515798648278f30cfd34869f243542bd3':
  Fix string.compare() logic.  It happens to be working luckily.
2012-08-09 04:04:26 -07:00
Ken Wakasa
3b53045515 am 805ac949: Fix string.compare() logic. It happens to be working luckily.
* commit '805ac949d22946e60cbe311676e32d1f4f02ced3':
  Fix string.compare() logic.  It happens to be working luckily.
2012-08-09 04:03:05 -07:00
Ken Wakasa
805ac949d2 Fix string.compare() logic. It happens to be working luckily.
Change-Id: I262c6d5779124e5b09ad1a66ca3c9ddb2fc6d7d5
2012-08-09 19:36:58 +09:00
Ken Wakasa
fb662603b8 am d26d20fe: am 71b379df: Merge "Use GetStringUTFRegion" into jb-mr1-dev
* commit 'd26d20fe225bb2ac70ea184af8e85fb995f44a68':
  Use GetStringUTFRegion
2012-08-09 02:57:39 -07:00
Ken Wakasa
d26d20fe22 am 71b379df: Merge "Use GetStringUTFRegion" into jb-mr1-dev
* commit '71b379df51de95dfb0071506b4eb6a64eadd8832':
  Use GetStringUTFRegion
2012-08-09 02:56:20 -07:00