24bf5fe618
am b1844a57: am b240c38e: Merge "[DO NOT MERGE] Correct a wrong base character in Russian" into jb-mr1.1-dev
...
* commit 'b1844a57e1d05ac398beed2695b883d2f736cd13':
[DO NOT MERGE] Correct a wrong base character in Russian
2012-11-14 20:37:43 -08:00
b1844a57e1
am b240c38e: Merge "[DO NOT MERGE] Correct a wrong base character in Russian" into jb-mr1.1-dev
...
* commit 'b240c38ea2e10460aeb351fa9aef56f3d872bca3':
[DO NOT MERGE] Correct a wrong base character in Russian
2012-11-14 20:35:25 -08:00
b240c38ea2
Merge "[DO NOT MERGE] Correct a wrong base character in Russian" into jb-mr1.1-dev
2012-11-14 20:34:15 -08:00
eea28db333
am d4886ff5: am 929bfdd0: Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
...
* commit 'd4886ff5419003c3bf996939ba87e4b49bcdbfae':
Update shift state only when input field is restarted
2012-11-14 16:33:20 -08:00
dda024cf30
am 428d1b64: am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev
...
* commit '428d1b6469b5bc9041c35a7e1ee1476d5aacedd7':
Fix language switch key behavior (DO NOT MERGE)
2012-11-14 16:33:19 -08:00
d4886ff541
am 929bfdd0: Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
...
* commit '929bfdd059df5bb0340a3b22a3feff211f03798e':
Update shift state only when input field is restarted
2012-11-14 16:31:31 -08:00
428d1b6469
am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev
...
* commit '4826c3ff7ec8640d2a982e9362577b2900614080':
Fix language switch key behavior (DO NOT MERGE)
2012-11-14 16:31:30 -08:00
929bfdd059
Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
2012-11-14 16:29:43 -08:00
4826c3ff7e
Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev
2012-11-14 16:29:32 -08:00
f83e640419
am 36c6e293: am aef0acdb: DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
...
* commit '36c6e2933f1e25013b5d04d651cab8938e7f1090':
DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
2012-11-14 15:19:43 -08:00
36c6e2933f
am aef0acdb: DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
...
* commit 'aef0acdbe078fe83ed834ffe986e9cb7b4b8df7d':
DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
2012-11-14 15:18:13 -08:00
aef0acdbe0
DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
...
Cherrypick of I67a431d8
bug: 7539944
Change-Id: I0d1f9649f30c36b8e464944a5b881c2cb9c05ccf
2012-11-15 00:54:53 +09:00
d0725a6842
Update shift state only when input field is restarted
...
Bug: 7482766
Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285
2012-11-14 18:44:43 +09:00
d62be28515
Fix language switch key behavior (DO NOT MERGE)
...
Bug: 7075923
Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496
2012-11-14 18:29:01 +09:00
f1d0b2b911
[DO NOT MERGE] Correct a wrong base character in Russian
...
Bug: 7516306
Change-Id: I80cee4b2b11e5bfa68c12923049cb612abd0bc7e
2012-11-14 15:50:28 +09:00
18ff561253
am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
...
* commit 'f592270a0f092c5ef52bbb0f24c8873f46e75503':
Make sure all FDs are correctly closed.
2012-11-13 18:45:42 -08:00
f592270a0f
am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
...
* commit '7648b37d1e4cf3799288f85cc9c5f67b515e24c4':
Make sure all FDs are correctly closed.
2012-11-13 18:43:57 -08:00
7648b37d1e
Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
2012-11-13 18:42:35 -08:00
5c32b6da44
Make sure all FDs are correctly closed.
...
In this kind of series of calls, it's possible that an outer call to a
constructor fails, but the inner succeeded.
Example:
try {
is = new A(new B());
} finally {
if (null != is) is.close();
}
In this case, if new B() succeeds but new A() throws an
exception, is stays null and the intermediate object is never
closed. This is what was happening in this instance.
Bug: 7377336
Change-Id: I3fae9fec1135244982fcf5098c76d93f3e0f2add
2012-11-13 16:53:07 +09:00
d2116eb2ea
am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev
...
* commit '7d34763e23cb49c8c96dbf9b4c613e17098dd919':
Don't restrict reset composing state to non-identical setText
2012-11-12 23:04:39 -08:00
3a9ba17fd2
am a13a8a58: am 0e84041b: Refactor all phantom-space-inserted spaces in one place
...
* commit 'a13a8a58e05ecd3f9eccdc47ceca972a814d247e':
Refactor all phantom-space-inserted spaces in one place
2012-11-12 23:04:37 -08:00
7d34763e23
am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev
...
* commit 'fac619a34c8101cac504db500d74114dc8768372':
Don't restrict reset composing state to non-identical setText
2012-11-12 23:02:34 -08:00
a13a8a58e0
am 0e84041b: Refactor all phantom-space-inserted spaces in one place
...
* commit '0e84041bf740590230198fa845d8c45acd4cb586':
Refactor all phantom-space-inserted spaces in one place
2012-11-12 23:02:32 -08:00
fac619a34c
Merge "Don't restrict reset composing state to non-identical setText" into jb-mr1.1-dev
2012-11-12 23:00:12 -08:00
0e84041bf7
Refactor all phantom-space-inserted spaces in one place
...
Bug: 7164981
Change-Id: If1635c212b2d5d9cf51f5fb074f3b20dd7ec7b2a
2012-11-13 12:53:55 +09:00
61cc2a3391
Don't restrict reset composing state to non-identical setText
...
Bug: 7497063
Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478
2012-11-12 18:34:18 +09:00
21177c1afe
Remove gesture typing settings when disabled by configuration
...
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 07:58:27 -08:00
9185a6c2c3
am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge
...
* commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':
2012-11-08 06:27:09 -08:00
4eef51016a
am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
...
* commit 'aa5d6fe05ce45e36b732a3abc849508cd8279257':
Reset the IME if requested by the app.
2012-11-08 06:12:57 -08:00
a8ec322b1a
am bc43e3f2: Reconcile with jb-mr1-release - do not merge
...
* commit 'bc43e3f29060252d2a08b4e976bdb2ca50438623':
2012-11-07 10:24:23 -08:00
bc43e3f290
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I105d8e6a795dd5b38d42051196581896e7ea4f30
2012-11-07 10:20:18 -08:00
be07aad4e9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 18:04:26 -08:00
aa5d6fe05c
am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
...
* commit '9cc22c45ec04f3b1772631e1ef18103dc55c2a0b':
Reset the IME if requested by the app.
2012-11-06 14:29:45 -08:00
9cc22c45ec
am 5d2556b9: Reset the IME if requested by the app.
...
* commit '5d2556b93286f5f1d7d829b586b84a8b7ae55743':
Reset the IME if requested by the app.
2012-11-06 14:27:24 -08:00
ef51f33e54
am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '4d09554794ace67b01a6674c36edd5495b32cc38':
2012-11-06 12:30:07 -08:00
4d09554794
am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '202c3a5f32e20939a3dff24b7e2f047e47b29e17':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Build LatinIME with NDK r8
2012-11-06 12:24:06 -08:00
202c3a5f32
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I355e91c06f0958f1baec5923324dcbcdf408d3f2
2012-11-06 12:18:48 -08:00
5d2556b932
Reset the IME if requested by the app.
...
Specifically, reset the KeyboardState to the main Alphabet layout in
LatinIME.onStartInputViewInternal() if a keyboard layout set doesn't get
reloaded in the method.
Please note TextView.setText() calls up resetInput(), then the IME should
reset with it.
bug: 7482086
Note that bug: 6851364 needs to be revisited.
Change-Id: I5d448c10963d3dd952dd13cb587085ec7b014e69
2012-11-07 01:09:26 +09:00
b2b10f9ad8
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I4a04730079d76f1d050c1bcdeb701bd8bbb79511
2012-10-31 09:18:41 -07:00
cbbfb472ab
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-26 16:23:17 -07:00
5199b8bf1a
am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
...
* commit 'f6df37ce2dce9ada1af097e0c2fbdd84c0334c61':
LatinIME: Add accents to german keyboard
2012-10-25 23:11:21 -07:00
f6df37ce2d
Merge "LatinIME: Add accents to german keyboard"
2012-10-25 22:47:24 -07:00
ef5f88f33e
am 5e118c4c: am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
...
* commit '5e118c4c048254d40405dbb454bbea9ab9e9d174':
Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
2012-10-25 19:29:16 -07:00
5e118c4c04
am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
...
* commit '60dea36dafc4a567b948b5175bcca776b08fdfad':
Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
2012-10-25 19:26:35 -07:00
60dea36daf
Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
...
Bug: 7393485
Bug: 7272829
Change-Id: I873e8d99486c734e76484526631a90fc55e91c86
2012-10-25 20:00:46 +09:00
99a8169e18
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-24 06:59:24 -07:00
7c22c62d8f
am 1f9eea44: am 306e0a80: Update AOSP dictionaries.
...
* commit '1f9eea44dc4e9b8365938647b2f257f229abfff4':
Update AOSP dictionaries.
2012-10-24 00:29:04 -07:00
1f9eea44dc
am 306e0a80: Update AOSP dictionaries.
...
* commit '306e0a800f2ac9fc6af24d41bfff2d8445e963c4':
Update AOSP dictionaries.
2012-10-24 00:26:30 -07:00
306e0a800f
Update AOSP dictionaries.
...
Changes :
- Add "emoji"
- Change the whitelist target of "foo" from "for" to "too"
- Fix non-word frequencies to 0
- Fix the freq of common en_US vs en_GB words
- Add "connection" to the en_GB dictionary
Bug: 7368441
Bug: 7370033
Bug: 7371955
Change-Id: Ib22a97e97b486b05012d5496619557f406c441b9
2012-10-24 16:12:28 +09:00
9f97ced562
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-23 06:59:51 -07:00
Jean Chalard
Tadashi G. Takaoka
Ken Wakasa
The Android Open Source Project
The Android Automerger
Satoshi Kataoka