0b82582270
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-16 19:49:39 +09:00
fe9ec6bc7d
Remove unused variables
...
Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca
2012-11-16 19:28:56 +09:00
d6f3dace08
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-15 12:41:56 +09:00
0dfb89b41e
am eea28db3: am d4886ff5: am 929bfdd0: Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
...
* commit 'eea28db3333a734bf73e688b8335245929d5f322':
Update shift state only when input field is restarted
2012-11-14 16:34:42 -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
929bfdd059
Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
2012-11-14 16:29:43 -08:00
f4ae7ba881
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-14 20:14:55 +09:00
d19025f70a
Merge "Add Mongolian keyboard"
2012-11-14 02:01:03 -08:00
d0725a6842
Update shift state only when input field is restarted
...
Bug: 7482766
Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285
2012-11-14 18:44:43 +09:00
4a3d4620fc
Merge "Fix language switch key behavior"
2012-11-14 01:42:12 -08:00
d62be28515
Fix language switch key behavior (DO NOT MERGE)
...
Bug: 7075923
Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496
2012-11-14 18:29:01 +09:00
1931c1cab1
Fix language switch key behavior
...
Bug: 7075923
Change-Id: I306e1ff5d9f873541e84e1fafb64b9473947f623
2012-11-14 18:27:00 +09:00
b83aaf7e5b
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-14 18:02:32 +09:00
ee672144c9
Merge "Swap single and double quotation marks in Spanish tablet keyboard"
2012-11-13 23:00:53 -08:00
0d3eb7d963
Swap single and double quotation marks in Spanish tablet keyboard
...
Bug: 6672279
Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155
2012-11-14 15:54:19 +09:00
b4061d6c32
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-14 15:05:39 +09:00
1ee6e14507
Hide statustics logging option
...
Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
2012-11-14 14:01:52 +09:00
2b939d1260
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-14 12:20:05 +09:00
372f9da4f9
am 18ff5612: am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
...
* commit '18ff56125345746e288118d177fcabf3c079ead3':
Make sure all FDs are correctly closed.
2012-11-13 18:47:02 -08: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
7648b37d1e
Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
2012-11-13 18:42:35 -08:00
63531e1433
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-13 20:08:59 +09: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
80d7d32424
am d2116eb2: am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev
...
* commit 'd2116eb2ea7d08e81b7efe5e342772ffcd8a7efc':
Don't restrict reset composing state to non-identical setText
2012-11-12 23:48:20 -08:00
1b909c2846
Resolve conflicts for merge of 3a9ba17f to master"
...
Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49
2012-11-13 16:34:23 +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
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
32a18091a0
Add Mongolian keyboard
...
Bug: 7455289
Change-Id: Ifdf6f38a07f75fb2154a17899e6be5f89082638f
2012-11-13 15:53:15 +09:00
72b5daf03d
Use hexadecimal constants for subtypeId
...
Change-Id: I5ee7981f1d1d142c4d21d0257879e8e126860fa6
2012-11-13 15:18:28 +09: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
6d05505bbf
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-12 15:47:29 +09:00
eaaee28647
Merge "Enhance ImfUtils to InputMethodManagerWrapper class"
2012-11-11 22:43:07 -08:00
6fbbab3b84
Enhance ImfUtils to InputMethodManagerWrapper class
...
Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
2012-11-12 15:23:43 +09:00
5d51e8f997
Remove backup agent from AOSP Android Keyboard
...
Bug: 4590284
Change-Id: I22f0e42cb898d20dfc2c4506493bf48170ce7b04
2012-11-12 12:37:25 +09:00
f3b0e9a56c
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-10 20:18:34 +09:00
53bd25bf3a
Import translations. DO NOT MERGE
...
Change-Id: Ibf5dc194560d09cc1945c5478197b9170c176492
Auto-generated-cl: translation import
2012-11-09 12:45:34 -08:00
21177c1afe
Remove gesture typing settings when disabled by configuration
...
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 07:58:27 -08:00
01d47b8096
Fix a logic flaw.
...
This test is seriously wrong : although we do have a method that
does exactly the right thing, this looks at a very specific, unrelated
variable state in hope it happens to be set only in the relevant
cases by the play of logic.
I don't think this changes anything concretely, as the assumption
was probably true in the practice ; still, this code is very hard to
read and prone to unexpected breakage.
Change-Id: I77ab576f90762429fcc752df31ed30e1c81871dc
2012-11-09 19:16:37 +09:00
c026b578dd
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-09 15:13:14 +09:00
710d06cea9
Suppress dictionary pack support when IS_EXPERIMENTAL is true
...
Change-Id: If8813cb989c1fa8744a3bf36e8514ced3c8f46a3
2012-11-09 15:03:31 +09:00
c43ff6f66c
Remove gesture typing settings when disabled by configuration
...
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 12:44:40 +09:00
43f579e9f6
am 4eef5101: am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
...
* commit '4eef51016adc4e103fa65d944a0ab31527ddced8':
Reset the IME if requested by the app.
2012-11-08 06:22:02 -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
8df57deb05
Import translations. DO NOT MERGE
...
Change-Id: I97ceec5680a8ba9f27d5f62a7573555590268376
Auto-generated-cl: translation import
2012-11-06 16:54:45 -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
6962a566f4
Resolve merge conflict
...
Change-Id: I96c87f7a4e4d34357d3d4c772eb3782c171bb4c0
2012-11-06 13:52:52 +09:00
9c739939a3
Add missing res dir
...
Change-Id: I50e79bbb1f2eab33c7e5a76086bbe41f7e757ada
2012-11-06 13:49:17 +09:00
Ken Wakasa
Tadashi G. Takaoka
Satoshi Kataoka
Jean Chalard
Baligh Uddin