Joe Onorato
8685030562
am 33afbf9a
: am 38be4ee0
: Merge "Unnessary LOCAL_MODULE_TAGS"
...
* commit '33afbf9a3438df786782283b57a399599809dba6':
Unnessary LOCAL_MODULE_TAGS
2012-08-17 00:16:42 -07:00
Joe Onorato
33afbf9a34
am 38be4ee0
: Merge "Unnessary LOCAL_MODULE_TAGS"
...
* commit '38be4ee0fae07ed4abf6aab573fdc9b5955e7895':
Unnessary LOCAL_MODULE_TAGS
2012-08-16 23:58:09 -07:00
Joe Onorato
38be4ee0fa
Merge "Unnessary LOCAL_MODULE_TAGS"
2012-08-16 23:38:19 -07:00
Jean Chalard
46fc768e54
Remove the whitelist dictionary.
...
The functionality now lives in the binary dictionary.
This finalizes work on
Bug: 6906525
Change-Id: Id106d871e8afdf9afa886d2a30bea87ff89f2d24
2012-08-17 15:13:10 +09:00
Ken Wakasa
99927f865f
am de8a9a82
: Small cleanups
...
* commit 'de8a9a8227a7a558720edba9d57fa7a056417eb4':
Small cleanups
2012-08-16 21:17:37 -07:00
Ken Wakasa
de8a9a8227
Small cleanups
...
Change-Id: Ib66507b8934bc8019a762d24d5311411e044ec84
2012-08-17 13:06:28 +09:00
Jean Chalard
3e43e6998e
Remove access to the whitelist class.
...
...which becomes useless. It will be entirely removed in an
upcoming change.
Change-Id: I2f1d27f1eceda79454b01f21e057b98f2953131a
2012-08-17 13:01:25 +09:00
Jean Chalard
77a34f2e49
am e2ac3932
: Merge "Allow one-character suggestions." into jb-mr1-dev
...
* commit 'e2ac3932e390590fca7a3814556331db6a08362c':
Allow one-character suggestions.
2012-08-16 19:25:48 -07:00
Jean Chalard
e2ac3932e3
Merge "Allow one-character suggestions." into jb-mr1-dev
2012-08-16 19:23:32 -07:00
The Android Open Source Project
9765273127
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I12ca58a05a6640c7db80f88ce271131f164fed10
2012-08-16 19:11:24 -07:00
Jean Chalard
8af8c15c6b
Allow one-character suggestions.
...
Bug: 6906525
Change-Id: I62117653ac1281f825afc4ebb30f7e786902b750
2012-08-17 11:10:58 +09:00
Jean Chalard
7145ca7138
am 228674f6
: Merge "fix findWordInTree." into jb-mr1-dev
...
* commit '228674f6c7ce8891ca6b358db94da921712d9960':
fix findWordInTree.
2012-08-16 18:56:45 -07:00
Jean Chalard
228674f6c7
Merge "fix findWordInTree." into jb-mr1-dev
2012-08-16 18:54:24 -07:00
Yuichiro Hanada
0d35c159fe
fix findWordInTree.
...
Change-Id: I8f42df28f76188677db9d4e55885e1fc6a40b53f
2012-08-17 10:23:01 +09:00
Jean Chalard
0d2cece02d
am 3083b4b7
: Merge "Fix a debug method" into jb-mr1-dev
...
* commit '3083b4b77d51b28749a819d4e01a09ec558956e4':
Fix a debug method
2012-08-16 18:00:28 -07:00
Jean Chalard
3083b4b77d
Merge "Fix a debug method" into jb-mr1-dev
2012-08-16 17:59:11 -07:00
Jean Chalard
cc1062cfd0
Fix a debug method
...
Change-Id: Icf78fb0d5f7caea78f053fffd1ecd4289629964a
2012-08-17 09:24:45 +09:00
Baligh Uddin
cd4c6c4d21
am a07590a8
: Import translations. DO NOT MERGE
...
* commit 'a07590a81c270c5843237f8edb4f58f6f4fabd8a':
Import translations. DO NOT MERGE
2012-08-16 15:23:58 -07:00
Baligh Uddin
a07590a81c
Import translations. DO NOT MERGE
...
Change-Id: I5d02e55780596d25356a602027f3c41913057810
Auto-generated-cl: translation import
2012-08-16 15:17:17 -07:00
The Android Automerger
36b871ae0c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-16 06:34:44 -07:00
Ken Wakasa
5b0c0e5519
am bc44ad77
: Merge "fix findWordInTree." into jb-mr1-dev
...
* commit 'bc44ad77e50a9f5ca2dab2c5153971b23c33fa2c':
fix findWordInTree.
2012-08-16 04:59:05 -07:00
Ken Wakasa
bc44ad77e5
Merge "fix findWordInTree." into jb-mr1-dev
2012-08-16 04:26:55 -07:00
Yuichiro Hanada
66f338983b
fix findWordInTree.
...
Change-Id: I9d81c815494a0670afa81219ad7bad82274d997e
2012-08-16 20:21:47 +09: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
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
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
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
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
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
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
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
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
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
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
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