Jean Chalard
7bf71ca809
am 753f7b12
: Merge "Hack to skip reading an outdated binary file." into jb-mr1-dev
...
* commit '753f7b123e721cdb7519f6c4e21b6bb5e6d735b3':
Hack to skip reading an outdated binary file.
2012-08-19 22:13:37 -07:00
Jean Chalard
753f7b123e
Merge "Hack to skip reading an outdated binary file." into jb-mr1-dev
2012-08-19 22:11:44 -07:00
Jean Chalard
13822d2b05
Hack to skip reading an outdated binary file.
...
Bug: 7005813
Change-Id: Ie0d8d4b2d5eb147838ca23bdd5ec1cecd4f01151
2012-08-20 13:56:52 +09:00
Tadashi G. Takaoka
8c0cab8ef6
am 6c63f712
: Add standard view constructors of PrevewPlacerView
...
* commit '6c63f712655efe7e2d72cb2a0af9a0d8fdf0c730':
Add standard view constructors of PrevewPlacerView
2012-08-19 20:57:54 -07:00
Tadashi G. Takaoka
6c63f71265
Add standard view constructors of PrevewPlacerView
...
Change-Id: I00d7ae4d2330804c342a5e51cf8c0df6ed8a85d6
2012-08-20 11:56:28 +09:00
Ken Wakasa
13cc1dbaa3
am 522e1266
: Cosmetic fixes
...
* commit '522e12660a8541a5e98b4737d55e40bd6c49ee00':
Cosmetic fixes
2012-08-18 09:33:50 -07:00
Ken Wakasa
522e12660a
Cosmetic fixes
...
Change-Id: I5460252af534d4455ba22273a06ac956bc904831
2012-08-19 01:26:05 +09:00
Ken Wakasa
1f6e2faa33
am e46d1292
: Fix NPE in LatinIME.addToUserHistoryDictionary()
...
* commit 'e46d12927ee2717788248b05f00b751beaf2a02a':
Fix NPE in LatinIME.addToUserHistoryDictionary()
2012-08-17 08:12:40 -07:00
Ken Wakasa
e46d12927e
Fix NPE in LatinIME.addToUserHistoryDictionary()
...
bug: 7007063
Change-Id: Ie3e2f77dcbc597dda0c0df9a970336e5aac0edba
2012-08-18 00:04:33 +09:00
Ken Wakasa
33371e8864
am 4af10075
: (DO NOT MERGE) Remove useless module tags from makefiles
...
* commit '4af100759b462e59b04008be4376e23226703efd':
(DO NOT MERGE) Remove useless module tags from makefiles
2012-08-17 05:07:02 -07:00
Ken Wakasa
4af100759b
(DO NOT MERGE) Remove useless module tags from makefiles
...
Change-Id: If77482da66e80b762cf205369f7d53d069cd8072
2012-08-17 20:12:49 +09:00
Ken Wakasa
a7a11e68a7
am 72c0f4de
: Merge "add reconstructBigramFrequency" into jb-mr1-dev
...
* commit '72c0f4de1dfaaa1e404f46da48d7c91f28b76f74':
add reconstructBigramFrequency
2012-08-17 03:21:06 -07:00
Ken Wakasa
72c0f4de1d
Merge "add reconstructBigramFrequency" into jb-mr1-dev
2012-08-17 03:19:12 -07:00
Yuichiro Hanada
c0a75c8ecb
add reconstructBigramFrequency
...
Change-Id: Iff20dcb9ca0d6064bb118247887fe24b812c0c61
2012-08-17 19:05:16 +09:00
Jean Chalard
1b4dfd4ccb
am 1edd557c
: Merge "Reword a confusing comment" into jb-mr1-dev
...
* commit '1edd557cf2b7d480275b1747d1915d919c788990':
Reword a confusing comment
2012-08-17 01:40:58 -07:00
Jean Chalard
1edd557cf2
Merge "Reword a confusing comment" into jb-mr1-dev
2012-08-17 01:39:13 -07:00
Jean Chalard
aa27635a8a
Reword a confusing comment
...
Bug: 7005645
Change-Id: Ifd942b3ce242aeeec512e132e1cee31329e994b1
2012-08-17 17:22:28 +09:00
Joe Onorato
07344df292
am 86850305
: am 33afbf9a
: am 38be4ee0
: Merge "Unnessary LOCAL_MODULE_TAGS"
...
* commit '86850305625ded4ca4f1508fdf343cc4b7b37990':
Unnessary LOCAL_MODULE_TAGS
2012-08-17 00:19:06 -07:00
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
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
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