Commit Graph

8030 Commits (99927f865faff5a9f31de315620447fd963f3dff)

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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 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 d26d20fe22 am 71b379df: Merge "Use GetStringUTFRegion" into jb-mr1-dev
* commit '71b379df51de95dfb0071506b4eb6a64eadd8832':
  Use GetStringUTFRegion
2012-08-09 02:56:20 -07:00
Ken Wakasa 71b379df51 Merge "Use GetStringUTFRegion" into jb-mr1-dev 2012-08-09 02:54:38 -07:00
Satoshi Kataoka 73fc766e8c am 9d298716: Add reset method for dic travserse session
* commit '9d29871605515ac0f6071882213a90bc75dfd9ba':
  Add reset method for dic travserse session
2012-08-09 02:19:32 -07:00
Satoshi Kataoka 9d29871605 Add reset method for dic travserse session
Change-Id: Ia3dd924f92549da2cf8302ef77c629902d4f275b
2012-08-09 17:49:19 +09:00
Tadashi G. Takaoka 03c580e801 am 877157e1: Optimize keyboard drawing code a bit
* commit '877157e1f5ed44d6490eaf8fab430f9a73caf34d':
  Optimize keyboard drawing code a bit
2012-08-09 00:59:26 -07:00
Tadashi G. Takaoka 877157e1f5 Optimize keyboard drawing code a bit
* Remove useless boolean flag.
 * Use invalidate(int,int,int,int).
 * Don't draw background when hardware acceleration is enabled.

Change-Id: Id560ac84f33b5151437a42a4ff22736284d71e2d
2012-08-09 16:44:11 +09:00
Tadashi G. Takaoka 80d63d2263 am f40a6669: Merge "Update dictionary availability at onStartInputView" into jb-mr1-dev
* commit 'f40a666902719fac076231b655444b8168cfb755':
  Update dictionary availability at onStartInputView
2012-08-09 00:13:57 -07:00
Tadashi G. Takaoka f40a666902 Merge "Update dictionary availability at onStartInputView" into jb-mr1-dev 2012-08-09 00:12:48 -07:00
Tadashi G. Takaoka 2be2d77664 Update dictionary availability at onStartInputView
This is a follow up of I7901c0f9489b4deb79314c2c903b138611bfd78e

Change-Id: I38c22e886db247c402a964e3ddd10b09a461151c
2012-08-09 16:09:54 +09:00
Ken Wakasa 0151145924 Use GetStringUTFRegion
Change-Id: I56ad66af4ee42ed32a6fd909a9a34d601874783a
2012-08-09 16:05:54 +09:00
Jean Chalard a6d37f4336 am ccd8ed53: Support stdin and stdout for compress/uncompress
* commit 'ccd8ed53b33a5f91961f40d576abd0a91b87a66d':
  Support stdin and stdout for compress/uncompress
2012-08-08 22:37:24 -07:00
Jean Chalard ccd8ed53b3 Support stdin and stdout for compress/uncompress
This will improve flexibility in dictionary generation by
allowing pipelined commands.

Change-Id: Ia07bdc82c8bd740b5dfee6b5fd1a067f4b8b7ba5
2012-08-09 14:25:13 +09:00
Tadashi G. Takaoka b2c579910e am 9abea49d: Merge "Fix NPE and don\'t call UI API from non-UI thread" into jb-mr1-dev
* commit '9abea49dd4f3428acb60f35ea7a8ff53aa2e2af7':
  Fix NPE and don't call UI API from non-UI thread
2012-08-08 20:01:50 -07:00
Tadashi G. Takaoka 9abea49dd4 Merge "Fix NPE and don't call UI API from non-UI thread" into jb-mr1-dev 2012-08-08 20:00:19 -07:00
Tadashi G. Takaoka 8335c59ea7 Fix NPE and don't call UI API from non-UI thread
This change also reverts I29ec3e9f10484f30288fac76f0c45b3707bc2259

Bug: 6956969
Bug: 6891020
Bug: 6947253
Change-Id: I7901c0f9489b4deb79314c2c903b138611bfd78e
2012-08-09 11:55:41 +09:00
The Android Open Source Project 2a73145908 Reconcile with jb-mr1-release - do not merge
Change-Id: I6bd7aec42a5020c19fe6d99a4a84dff009fb9db6
2012-08-08 08:18:13 -07:00
Satoshi Kataoka da31bde599 am 60d4961f: Merge "Pass traverse session" into jb-mr1-dev
* commit '60d4961f346dadf274f49e0f15c87dcffe8f5820':
  Pass traverse session
2012-08-08 07:52:09 -07:00