c445a32b12
am f5297a2b: am 0e301bdc: Merge "Generalize incremental recognition to non-Latin languages" into jb-mr1-dev
...
* commit 'f5297a2b615d98ebf178fb74c42c7349ac8f3e9f':
Generalize incremental recognition to non-Latin languages
2012-09-13 14:11:22 -07:00
de9dce44f5
am b78d7be6: am f8986ac6: Merge "Add tests for BinaryDictInputOutput." into jb-mr1-dev
...
* commit 'b78d7be6b455f6984c03a3f95a80c884c35a3573':
Add tests for BinaryDictInputOutput.
2012-09-13 14:11:19 -07:00
2fab276b19
am 1ab9ca8b: am 71fcf0f5: Assign subtypes\' hashCode value as its subtypeId
...
* commit '1ab9ca8bbddedbc71f9bab424e823fbfd27ae41d':
Assign subtypes' hashCode value as its subtypeId
2012-09-13 14:11:11 -07:00
f0bf673fe6
am 8171d9d9: am 9144eecd: Merge "Add boolean resource isDefault=true for all supported locales" into jb-mr1-dev
...
* commit '8171d9d9a6d7f685900f777e8b26df84a81c52d1':
Add boolean resource isDefault=true for all supported locales
2012-09-13 14:11:08 -07:00
da5ef60c95
am 63eef189: am 328755ee: Merge "Move FormatOptions and FileHeader to FormatSpec." into jb-mr1-dev
...
* commit '63eef1890dfb2cc9dd5f0a59786fde64a8a90904':
Move FormatOptions and FileHeader to FormatSpec.
2012-09-13 14:11:06 -07:00
87045568da
am b1963c2d: am 9deb52c9: Merge "Cosmetic change to remove trailing space" into jb-mr1-dev
...
* commit 'b1963c2d399bc700aecce89236a492a578629b23':
Cosmetic change to remove trailing space
2012-09-13 14:11:05 -07:00
877545e895
am 6b966b26: am f4554d8b: Fix an issue on FP calculation diff of osx and linux
...
* commit '6b966b2623647ebbab0e2a51f1390be93c422f2b':
Fix an issue on FP calculation diff of osx and linux
2012-09-13 14:11:04 -07:00
d18c931e70
am cdf4135f: am 81d97eec: Move constants and comments.
...
* commit 'cdf4135f6332d5e2bb25f6447e0d1fb735eb1976':
Move constants and comments.
2012-09-13 14:10:55 -07:00
568fb600d4
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-13 07:00:23 -07:00
5fbe3764ae
Small simplification (A3)
...
Change-Id: I2ea9566ce5cb1fbccd33a42836244a899365de6a
2012-09-13 20:13:52 +09:00
635f9773cd
am d7fdc730: Merge "Simplify a call, and add comments (A2)" into jb-mr1-dev
...
* commit 'd7fdc730c302c182cc34dd03018b4185df912727':
Simplify a call, and add comments (A2)
2012-09-13 03:40:32 -07:00
d7fdc730c3
Merge "Simplify a call, and add comments (A2)" into jb-mr1-dev
2012-09-13 03:38:50 -07:00
ae65d19e5a
am 50f0388e: Merge "Fix gesture floating preview on up event" into jb-mr1-dev
...
* commit '50f0388ee6515e9d52a1cb202e02dc5492d47d61':
Fix gesture floating preview on up event
2012-09-13 03:23:27 -07:00
50f0388ee6
Merge "Fix gesture floating preview on up event" into jb-mr1-dev
2012-09-13 03:21:12 -07:00
350fab6dc4
Fix gesture floating preview on up event
...
This is a follow up of Iddb26ba1.
Bug: 7119032
Change-Id: Ibbc94a1a4880ca31bd8aeece89893691b14acc4d
2012-09-13 19:07:09 +09:00
9950879447
am 2427f578: Merge "Import TextUtils.getCapsMode to fix it internally (A1)" into jb-mr1-dev
...
* commit '2427f578c8fafa85f3f9f74c00384f785e489bcf':
Import TextUtils.getCapsMode to fix it internally (A1)
2012-09-13 02:59:17 -07:00
3d54e1c1ec
Simplify a call, and add comments (A2)
...
Since the function has to be modified heavily but does a lot
of non-trivial work, add a wealth of comments explaining what
it does and why so as to facilitate understanding the changes
to come.
Bug: 4967874
Change-Id: I6c21aea15f161d807035f279dfb7d1b98b3e9144
2012-09-13 18:59:04 +09:00
2427f578c8
Merge "Import TextUtils.getCapsMode to fix it internally (A1)" into jb-mr1-dev
2012-09-13 02:57:35 -07:00
265083c85a
am 737e9150: Merge "Show gesture floating preview text at oldest finger" into jb-mr1-dev
...
* commit '737e9150935e1058b2d7d6adcd1b7857fa7c37ca':
Show gesture floating preview text at oldest finger
2012-09-13 02:33:58 -07:00
737e915093
Merge "Show gesture floating preview text at oldest finger" into jb-mr1-dev
2012-09-13 02:32:53 -07:00
a0fd2b4053
am 37872892: Merge "Make onUpdateSelection much more resilient to race conditions." into jb-mr1-dev
...
* commit '378728920bec5e43138573acb8473093e674fde9':
Make onUpdateSelection much more resilient to race conditions.
2012-09-13 02:30:23 -07:00
378728920b
Merge "Make onUpdateSelection much more resilient to race conditions." into jb-mr1-dev
2012-09-13 02:28:52 -07:00
f5297a2b61
am 0e301bdc: Merge "Generalize incremental recognition to non-Latin languages" into jb-mr1-dev
...
* commit '0e301bdc294b4a22688e486b4570948ff98b9ccf':
Generalize incremental recognition to non-Latin languages
2012-09-13 02:28:44 -07:00
0e301bdc29
Merge "Generalize incremental recognition to non-Latin languages" into jb-mr1-dev
2012-09-13 02:26:54 -07:00
b78d7be6b4
am f8986ac6: Merge "Add tests for BinaryDictInputOutput." into jb-mr1-dev
...
* commit 'f8986ac69bd1928e0dcf044b28de69a7553cc512':
Add tests for BinaryDictInputOutput.
2012-09-13 02:21:54 -07:00
f8986ac69b
Merge "Add tests for BinaryDictInputOutput." into jb-mr1-dev
2012-09-13 02:20:59 -07:00
f0e83046f0
Show gesture floating preview text at oldest finger
...
Bug: 7119032
Change-Id: Iddb26ba1a595e472fde0982d744b5652d5fbda3e
2012-09-13 18:17:15 +09:00
7e35841053
Add tests for BinaryDictInputOutput.
...
Change-Id: I2ca66fd9a3568d5b6ece79d954095383d23a0a9f
2012-09-13 18:06:45 +09:00
9d1c73ffd8
Import TextUtils.getCapsMode to fix it internally (A1)
...
This should have on effect at all on behavior,
except an increase in performance.
Bug: 4967874
Bug: 6950087
Change-Id: Ie2b51efefe84ca767f5dc8e3b80bfef7e1faab3d
2012-09-13 17:46:39 +09:00
5ed88457bf
Make onUpdateSelection much more resilient to race conditions.
...
This is pretty much as strong as it gets. It should be
impossible to get false positives and nearly impossible to
get true negatives with this new code.
Bug: 6981089
Change-Id: Ia32ab62f89c5943f0be169b979abab652e67bf5b
2012-09-13 17:35:26 +09:00
1ab9ca8bbd
am 71fcf0f5: Assign subtypes\' hashCode value as its subtypeId
...
* commit '71fcf0f5ec04d1ca00e83a07768ba5883c74017d':
Assign subtypes' hashCode value as its subtypeId
2012-09-13 01:06:08 -07:00
71fcf0f5ec
Assign subtypes' hashCode value as its subtypeId
...
Bug: 6752230
Change-Id: I311b840c890f4c6ff89c2808237d7e9b8baef21d
2012-09-13 16:56:59 +09:00
8171d9d9a6
am 9144eecd: Merge "Add boolean resource isDefault=true for all supported locales" into jb-mr1-dev
...
* commit '9144eecd8e76d443fd884010f34504367f64a8ff':
Add boolean resource isDefault=true for all supported locales
2012-09-13 00:44:39 -07:00
9144eecd8e
Merge "Add boolean resource isDefault=true for all supported locales" into jb-mr1-dev
2012-09-13 00:43:18 -07:00
63eef1890d
am 328755ee: Merge "Move FormatOptions and FileHeader to FormatSpec." into jb-mr1-dev
...
* commit '328755eee2f6e44daa98a54bd0ee9c0f433c58be':
Move FormatOptions and FileHeader to FormatSpec.
2012-09-13 00:40:04 -07:00
328755eee2
Merge "Move FormatOptions and FileHeader to FormatSpec." into jb-mr1-dev
2012-09-13 00:38:44 -07:00
1a347723c5
Move FormatOptions and FileHeader to FormatSpec.
...
Change-Id: I232e35598635113bf2c81825669c744aadc79efe
2012-09-13 16:35:41 +09:00
82902e7671
Add boolean resource isDefault=true for all supported locales
...
Bug: 7115368
Change-Id: I390d52d10d6c7d1639f73255ace9985886ea2157
2012-09-13 15:56:35 +09:00
b1963c2d39
am 9deb52c9: Merge "Cosmetic change to remove trailing space" into jb-mr1-dev
...
* commit '9deb52c9968c0dfc00713b76aff9398173df6f79':
Cosmetic change to remove trailing space
2012-09-12 23:46:35 -07:00
9deb52c996
Merge "Cosmetic change to remove trailing space" into jb-mr1-dev
2012-09-12 23:44:22 -07:00
6b966b2623
am f4554d8b: Fix an issue on FP calculation diff of osx and linux
...
* commit 'f4554d8b10f25ab300d057ff0ebd16b2b7a70be8':
Fix an issue on FP calculation diff of osx and linux
2012-09-12 23:40:48 -07:00
c54614d9f3
Cosmetic change to remove trailing space
...
Change-Id: If8c00c763f815d5eb97e18b19060c63d321ccd61
2012-09-13 15:21:54 +09:00
f4554d8b10
Fix an issue on FP calculation diff of osx and linux
...
sugar on mac
result_type=1 expected=<1093> actual=<1047>
result_type=4 expected=<730> actual=<698>
result_type=5 expected=<177> actual=<173>
sugar on linux
result_type=1 expected=<1093> actual=<1047>
result_type=4 expected=<730> actual=<698>
result_type=5 expected=<177> actual=<173>
Change-Id: I4cd39becb0de4076dd37d870adda6463a96de424
2012-09-13 15:13:02 +09:00
cdf4135f63
am 81d97eec: Move constants and comments.
...
* commit '81d97eec0e77e72cce606f9c9f96091c0b348190':
Move constants and comments.
2012-09-12 22:37:05 -07:00
81d97eec0e
Move constants and comments.
...
Change-Id: Ifd66bda7d528827ba61c60531121ea206a2325be
2012-09-13 14:28:39 +09:00
132168519e
Generalize incremental recognition to non-Latin languages
...
Bug: 7043019
Change-Id: I9a26f74177d4f8f03b7b65e2e255e4087d5ef8d9
2012-09-12 20:09:18 -07:00
40359fce12
am 8537026d: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '8537026d45929affb9b201320c32e295e5d37852':
2012-09-12 16:59:15 -07:00
f8bc6c6295
am 181a9861: am 18fc3bf4: Merge "Make Latin IME aware of its surrounding text." into jb-mr1-dev
...
* commit '181a9861b1815fafca3cbbf48abbd91e821986b6':
Make Latin IME aware of its surrounding text.
2012-09-12 16:58:37 -07:00
0215ce2f5c
am f602b7ca: am 57e95111: Merge "Use offscreen bitmap buffer to draw gesture preview trail" into jb-mr1-dev
...
* commit 'f602b7caed8c314a854545813ec6a6c0c4c89ab9':
Use offscreen bitmap buffer to draw gesture preview trail
2012-09-12 16:58:35 -07:00
30543e01d9
am ec2039aa: am 8d031a63: Add put method to FusionDictionaryBufferInterface.
...
* commit 'ec2039aa66168c475a703e3c4e0798845a948db2':
Add put method to FusionDictionaryBufferInterface.
2012-09-12 16:58:34 -07:00
Tom Ouyang
Ken Wakasa
Tadashi G. Takaoka
Satoshi Kataoka
Yuichiro Hanada
The Android Automerger
Jean Chalard
The Android Open Source Project