Satoshi Kataoka
f4ae7ba881
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-14 20:14:55 +09:00
Ken Wakasa
f4e99d3494
Merge "Fix an error in the base char table for LETTER L WITH STROKE"
2012-11-14 03:11:30 -08:00
Ken Wakasa
e3fc8bc54d
Fix an error in the base char table for LETTER L WITH STROKE
...
bug: 7539944
Change-Id: I67a431d8d60f3236fb7d616504c5d0cf2166f486
2012-11-14 20:07:16 +09:00
Tadashi G. Takaoka
d19025f70a
Merge "Add Mongolian keyboard"
2012-11-14 02:01:03 -08:00
Tadashi G. Takaoka
4a3d4620fc
Merge "Fix language switch key behavior"
2012-11-14 01:42:12 -08:00
Tadashi G. Takaoka
1931c1cab1
Fix language switch key behavior
...
Bug: 7075923
Change-Id: I306e1ff5d9f873541e84e1fafb64b9473947f623
2012-11-14 18:27:00 +09:00
Satoshi Kataoka
b83aaf7e5b
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-14 18:02:32 +09:00
Jean Chalard
8590667d0c
Merge "Correct a wrong base character in Russian"
2012-11-14 00:14:36 -08:00
Jean Chalard
7c5b89a4d0
Correct a wrong base character in Russian
...
This is the master counterpart of I80cee4b2
Bug: 7516306
Change-Id: I1db4362bf12a98542c5f6fca3ae8010f16bd61a9
2012-11-14 17:09:41 +09:00
Tadashi G. Takaoka
ee672144c9
Merge "Swap single and double quotation marks in Spanish tablet keyboard"
2012-11-13 23:00:53 -08:00
Tadashi G. Takaoka
0d3eb7d963
Swap single and double quotation marks in Spanish tablet keyboard
...
Bug: 6672279
Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155
2012-11-14 15:54:19 +09:00
Satoshi Kataoka
b4061d6c32
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-14 15:05:39 +09:00
Satoshi Kataoka
1ee6e14507
Hide statustics logging option
...
Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
2012-11-14 14:01:52 +09:00
Ken Wakasa
2b939d1260
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-14 12:20:05 +09:00
Jean Chalard
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
Jean Chalard
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
Jean Chalard
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
Jean Chalard
7648b37d1e
Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
2012-11-13 18:42:35 -08:00
Ken Wakasa
63531e1433
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-13 20:08:59 +09:00
Jean Chalard
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
Jean Chalard
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
Jean Chalard
1b909c2846
Resolve conflicts for merge of 3a9ba17f
to master"
...
Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49
2012-11-13 16:34:23 +09:00
Jean Chalard
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
Jean Chalard
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
Jean Chalard
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
Jean Chalard
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
Jean Chalard
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
Tadashi G. Takaoka
32a18091a0
Add Mongolian keyboard
...
Bug: 7455289
Change-Id: Ifdf6f38a07f75fb2154a17899e6be5f89082638f
2012-11-13 15:53:15 +09:00
Tadashi G. Takaoka
72b5daf03d
Use hexadecimal constants for subtypeId
...
Change-Id: I5ee7981f1d1d142c4d21d0257879e8e126860fa6
2012-11-13 15:18:28 +09:00
Jean Chalard
0e84041bf7
Refactor all phantom-space-inserted spaces in one place
...
Bug: 7164981
Change-Id: If1635c212b2d5d9cf51f5fb074f3b20dd7ec7b2a
2012-11-13 12:53:55 +09:00
Jean Chalard
61cc2a3391
Don't restrict reset composing state to non-identical setText
...
Bug: 7497063
Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478
2012-11-12 18:34:18 +09:00
Ken Wakasa
6d05505bbf
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-12 15:47:29 +09:00
Tadashi G. Takaoka
eaaee28647
Merge "Enhance ImfUtils to InputMethodManagerWrapper class"
2012-11-11 22:43:07 -08:00
Tadashi G. Takaoka
6fbbab3b84
Enhance ImfUtils to InputMethodManagerWrapper class
...
Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
2012-11-12 15:23:43 +09:00
Satoshi Kataoka
5d51e8f997
Remove backup agent from AOSP Android Keyboard
...
Bug: 4590284
Change-Id: I22f0e42cb898d20dfc2c4506493bf48170ce7b04
2012-11-12 12:37:25 +09:00
Ken Wakasa
f3b0e9a56c
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-10 20:18:34 +09:00
Ken Wakasa
ee05f3f5b7
Cleanup basechars.cpp
...
Change-Id: I7b88876f60720182910fab97ef79f3d04fbd81f0
2012-11-10 19:38:26 +09:00
Baligh Uddin
b3e66833d5
Merge "Import translations. DO NOT MERGE"
2012-11-09 16:27:53 -08:00
Baligh Uddin
53bd25bf3a
Import translations. DO NOT MERGE
...
Change-Id: Ibf5dc194560d09cc1945c5478197b9170c176492
Auto-generated-cl: translation import
2012-11-09 12:45:34 -08:00
Tadashi G. Takaoka
ef2b4082fb
am 21177c1a: Remove gesture typing settings when disabled by configuration
...
* commit '21177c1afed4c04f436acbd1116568051167c899':
Remove gesture typing settings when disabled by configuration
2012-11-09 08:03:23 -08:00
Tadashi G. Takaoka
21177c1afe
Remove gesture typing settings when disabled by configuration
...
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 07:58:27 -08:00
Jean Chalard
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
Ken Wakasa
c026b578dd
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-09 15:13:14 +09:00
Ken Wakasa
710d06cea9
Suppress dictionary pack support when IS_EXPERIMENTAL is true
...
Change-Id: If8813cb989c1fa8744a3bf36e8514ced3c8f46a3
2012-11-09 15:03:31 +09:00
Tadashi G. Takaoka
c43ff6f66c
Remove gesture typing settings when disabled by configuration
...
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 12:44:40 +09:00
The Android Open Source Project
0b2aa7f63b
am 9185a6c2: (-s ours) am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge
...
* commit '9185a6c2c315a8db537edc5d1bf582199d157bb2':
2012-11-08 06:32:15 -08:00
The Android Open Source Project
9185a6c2c3
am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge
...
* commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':
2012-11-08 06:27:09 -08:00
Ken Wakasa
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
Ken Wakasa
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
Jean Chalard
5b1037fa94
Fix a bug in the diff tool
...
Fix reporting of removed attributes multiple times instead
of just one in some cases. Also, report the frequency of
the removed bigram in the same cases.
Change-Id: I1455fa7553fcebc3005c222bf5aa9afcf1678c31
2012-11-08 11:57:45 +09:00