Commit graph

9535 commits

Author SHA1 Message Date
Yuichiro Hanada
66f338983b fix findWordInTree.
Change-Id: I9d81c815494a0670afa81219ad7bad82274d997e
2012-08-16 20:21:47 +09:00
Ken Wakasa
39a2cee68d am 0acb1326: am fee0ac60: Cleanup and fix method visibility.
* commit '0acb13266988c1c582f1ce2ba26252e76702b607':
  Cleanup and fix method visibility.
2012-08-16 03:56:10 -07:00
Ken Wakasa
0acb132669 am fee0ac60: Cleanup and fix method visibility.
* commit 'fee0ac60b1cd0a4760ca8f310ff8a86b925d833b':
  Cleanup and fix method visibility.
2012-08-16 03:54:22 -07:00
Ken Wakasa
fee0ac60b1 Cleanup and fix method visibility.
Change-Id: Ia9e8c69da21ce22bf674ec6c7b2536008a360ea3
2012-08-16 19:34:02 +09:00
The Android Open Source Project
be2f9632b8 am 73946166: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '73946166007738852836243276d1f9041912dd89':
2012-08-15 08:32:31 -07:00
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
96d2164f9c am e6e64e11: am 4bf2c070: Merge "Step 30-A Constize gesture" into jb-mr1-dev
* commit 'e6e64e11d43cb2320a1fbef0ab8c87c32206657a':
  Step 30-A Constize gesture
2012-08-15 02:43:43 -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
c15fa010fd am e3884b04: am 91c64902: Merge "Refresh editor info when the text field attributes changes." into jb-mr1-dev
* commit 'e3884b041d24fb3dd4f9b53ddfb86cace75b450a':
  Refresh editor info when the text field attributes changes.
2012-08-15 02:38:41 -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
a01d0212d6 am 5252ca77: am cd0e0048: Merge "Ensure #offer always actually offers something." into jb-mr1-dev
* commit '5252ca773f9f5ce1ddd8afe423850c64834ba1a0':
  Ensure #offer always actually offers something.
2012-08-15 02:19:53 -07: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
f5b6272523 am 258eaa48: am 3979f060: Step 28-A Introduce the session Id to getSuggestion
* commit '258eaa48b4b7921a712dab24640273fd3e6c1efc':
  Step 28-A Introduce the session Id to getSuggestion
2012-08-14 23:49:25 -07: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
7508d32a5f am 641373b7: am 05384933: Fix the build.
* commit '641373b7356cb874b8bd413d49f2840abe026260':
  Fix the build.
2012-08-14 15:51:50 -07: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
bbd79bc4f0 am af0a0884: am dd7f7909: Merge "Change accessibility event type for app-driven speech." into jb-mr1-dev
* commit 'af0a0884463420b1a4e75780ba2b3eacae21c5ff':
  Change accessibility event type for app-driven speech.
2012-08-14 14:38:22 -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
3f2378f15d am 82b201ea: am 50eadf79: Retire LOCAL_NDK_VERSION.
* commit '82b201eaffbcf117f7723c184013d0e304ea25af':
  Retire LOCAL_NDK_VERSION.
2012-08-14 12:21:19 -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
Ying Wang
d52310801d Retire LOCAL_NDK_VERSION.
Bug: 6932421
Change-Id: I6cb8cdb3869c9c1c3d908f9c182e6f634ae76322
2012-08-14 10:34:14 -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
5d7f267ffb am 822139bd: am 267030dd: Cleanup casts.
* commit '822139bdf427bccd80fe46d925b90e03caedb773':
  Cleanup casts.
2012-08-14 03:18:34 -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
7e1160c6c5 am 6c2c1a04: am 54035065: Merge "A couple of cleanups. Remove unnecessary casts." into jb-mr1-dev
* commit '6c2c1a04f17c38b47ddd6878c54a4fb5c98ed970':
  A couple of cleanups.  Remove unnecessary casts.
2012-08-14 02:22:08 -07: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
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