c82c0d0ef2
Merge "Fix variation dumping."
2012-11-19 23:56:47 -08:00
4d0fa31779
Fix variation dumping.
...
Variations are not flags - they should not be OR'd in this way.
Only one variation may be active at a time.
Change-Id: I9d3d4c8fc04af56c914c65f9c55f1e7b9517fc68
2012-11-20 16:55:16 +09:00
76d4ffeebf
Add Spanish United States keyboard
...
The subtype locale name on the spacebar will be suppressed when only
one subtype is enabled and
- Subtype locale is equal to the system locale.
or
- Subtype language is equal to the system language but the subtype is
implicitly enabled.
Thus the "es_ES" system locale chooses "es" subtype keyboard
implicitly but the keyboard doesn't have the subtype name on its
spacebar.
This change also removes Spanish Latin America keyboard.
Bug: 7531804
Change-Id: Ib929e8235d643c0ba039eb010e18ab721a734e15
2012-11-19 15:39:44 +09:00
9904c9ebbd
am 333881c4: am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
...
* commit '333881c434f3905763dd92a585b17f9c515dd8a8':
Revert "Correctly add double quote to the space strippers"
2012-11-16 18:38:02 -08:00
41a2c10e72
resolved conflicts for merge of 4ad92578 to master
...
Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef
2012-11-17 11:33:48 +09:00
333881c434
am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
...
* commit '1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1':
Revert "Correctly add double quote to the space strippers"
2012-11-16 18:25:57 -08:00
66cee1f92d
Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
2012-11-16 18:20:49 -08:00
86e554739f
Revert "Correctly add double quote to the space strippers"
...
This reverts commit af7264abb7
2012-11-16 18:17:10 -08:00
4ad92578dd
am 7acd310d: am f9ff4fb5: Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
...
* commit '7acd310d02f060f3e3e29000db902dffb6b0df9c':
Revert "Only add spaces automatically when appropriate."
2012-11-16 18:05:42 -08:00
f9ff4fb5da
Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
2012-11-16 18:00:15 -08:00
5986931fcb
Revert "Only add spaces automatically when appropriate."
...
This reverts commit 6ce66d1c7d
2012-11-16 17:49:22 -08:00
ea23a28557
resolved conflicts for merge of 6f42cf1d to master
...
Change-Id: I054bb0cfba9de06473100010a76e2f3d9c2c1180
2012-11-16 11:23:33 -08:00
3a9f84a197
am 8c470f16: am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev
...
* commit '8c470f16db291e257ac538bd0ac2a9354d34010c':
Fix a bug with some text fields
2012-11-16 10:36:15 -08:00
2feb6b5b52
am 12c2e437: am d7dbaa9c: am e4958d5c: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
...
* commit '12c2e437949414ce52b7e40ad191f15c844726e9':
Correctly add double quote to the space strippers
2012-11-16 10:36:12 -08:00
fe9ec6bc7d
Remove unused variables
...
Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca
2012-11-16 19:28:56 +09:00
6f42cf1dee
am 3dd4548e: am 191d49ae: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
...
* commit '3dd4548ec6105ca774e84ab3223bdbcea1e4902e':
Only add spaces automatically when appropriate.
2012-11-15 19:14:00 -08:00
191d49ae8a
Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
2012-11-15 19:09:04 -08:00
6ce66d1c7d
Only add spaces automatically when appropriate.
...
Bug: 7164981
Change-Id: Id672104a0fda99c52923913fb0e40c3a1ead4787
2012-11-15 17:57:16 +09:00
8c470f16db
am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev
...
* commit '5dee6e69f1de114df1f258fdc62559237989dc75':
Fix a bug with some text fields
2012-11-14 20:40:33 -08:00
12c2e43794
am d7dbaa9c: am e4958d5c: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
...
* commit 'd7dbaa9cb6d6b511ad80ac770bc1de328ad95d76':
Correctly add double quote to the space strippers
2012-11-14 20:39:08 -08:00
187e683aea
Merge "Fix a bug with some text fields" into jb-mr1.1-dev
2012-11-14 20:37:19 -08:00
e4958d5c18
Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
2012-11-14 20:35:19 -08: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
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
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
1ee6e14507
Hide statustics logging option
...
Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
2012-11-14 14:01:52 +09:00
af7264abb7
Correctly add double quote to the space strippers
...
This is a format error >.>
Bug: 7531719
Change-Id: I34b4c496192a32862c1ecb85bb6f6f38a06d6c61
2012-11-14 13:00:15 +09:00
00c0010ccf
Fix a bug with some text fields
...
Not sure when this happens exactly, but it is possible that
InputConnection#getTextBeforeCursor returns null. This
happens for example upon rotating the screen with the
composing field empty in Gmail.
In this case, StringBuilder#append will convert the null
pointer into the string "null", which is sure better than a
crash, but can have a number of bad side-effects, like
auto-caps not working.
Bug: 7533034
Change-Id: Ia1cfab432c13a12ff1c2f013c59bac05a587f553
2012-11-14 12:22:40 +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
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
eaaee28647
Merge "Enhance ImfUtils to InputMethodManagerWrapper class"
2012-11-11 22:43:07 -08:00
Jean Chalard
Tadashi G. Takaoka
Ken Wakasa
Marco Nelissen
Satoshi Kataoka