Marco Nelissen
ea23a28557
resolved conflicts for merge of 6f42cf1d to master
...
Change-Id: I054bb0cfba9de06473100010a76e2f3d9c2c1180
2012-11-16 11:23:33 -08:00
Jean Chalard
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
Jean Chalard
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
Jean Chalard
4d67c6f95b
am 24bf5fe6: (-s ours) am b1844a57: am b240c38e: Merge "[DO NOT MERGE] Correct a wrong base character in Russian" into jb-mr1.1-dev
...
* commit '24bf5fe6181ae61298a5c2ee4c6c559b95391a0a':
[DO NOT MERGE] Correct a wrong base character in Russian
2012-11-16 10:36:11 -08:00
Satoshi Kataoka
b5b434d867
Merge "Cleanup speed related code"
2012-11-16 02:46:12 -08:00
Satoshi Kataoka
feec20a692
Cleanup speed related code
...
Change-Id: Id6ea99a9e28f20f3ac34b9bfdac1bf62fd7a9a5d
2012-11-16 19:44:14 +09:00
Ken Wakasa
fe9ec6bc7d
Remove unused variables
...
Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca
2012-11-16 19:28:56 +09:00
Jean Chalard
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
Jean Chalard
3dd4548ec6
am 191d49ae: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
...
* commit '191d49ae8a0f4bb10724b83d9424d80f08ac7181':
Only add spaces automatically when appropriate.
2012-11-15 19:12:11 -08:00
Jean Chalard
191d49ae8a
Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
2012-11-15 19:09:04 -08:00
Satoshi Kataoka
f25cc4405e
Fix debug logs
...
Change-Id: Ie7dc32f28915df62a7c31bdaed38c0ad7a4b0f1c
2012-11-15 22:48:20 +09:00
Ken Wakasa
1ce96fecf5
Fix debug build error
...
Change-Id: Id18d72093a36d41859744f98238b3b761ddb667e
2012-11-15 19:14:36 +09:00
Jean Chalard
6ce66d1c7d
Only add spaces automatically when appropriate.
...
Bug: 7164981
Change-Id: Id672104a0fda99c52923913fb0e40c3a1ead4787
2012-11-15 17:57:16 +09:00
Jean Chalard
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
Jean Chalard
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
Jean Chalard
5dee6e69f1
am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev
...
* commit '187e683aea117fde1ad2de2d0cdd18c3fd4ce7f4':
Fix a bug with some text fields
2012-11-14 20:38:19 -08:00
Jean Chalard
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
Jean Chalard
187e683aea
Merge "Fix a bug with some text fields" into jb-mr1.1-dev
2012-11-14 20:37:19 -08:00
Jean Chalard
d7dbaa9cb6
am e4958d5c: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
...
* commit 'e4958d5c185ecf3a4e953c4a20f0208ac396da56':
Correctly add double quote to the space strippers
2012-11-14 20:36:54 -08:00
Jean Chalard
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
Jean Chalard
e4958d5c18
Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
2012-11-14 20:35:19 -08:00
Jean Chalard
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
712b5e8f10
am dda024cf: (-s ours) am 428d1b64: am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev
...
* commit 'dda024cf300cfc69125a8812d565df4f512e64f5':
Fix language switch key behavior (DO NOT MERGE)
2012-11-14 16:34:41 -08:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
929bfdd059
Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
2012-11-14 16:29:43 -08:00
Tadashi G. Takaoka
4826c3ff7e
Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev
2012-11-14 16:29:32 -08:00
Ken Wakasa
481047748c
am f83e6404: (-s ours) am 36c6e293: am aef0acdb: DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
...
* commit 'f83e640419b7917af938deba654238c21653ee1d':
DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
2012-11-14 15:21:57 -08:00
Ken Wakasa
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
Ken Wakasa
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
Ken Wakasa
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
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
d0725a6842
Update shift state only when input field is restarted
...
Bug: 7482766
Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285
2012-11-14 18:44:43 +09:00
Tadashi G. Takaoka
4a3d4620fc
Merge "Fix language switch key behavior"
2012-11-14 01:42:12 -08:00
Tadashi G. Takaoka
d62be28515
Fix language switch key behavior (DO NOT MERGE)
...
Bug: 7075923
Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496
2012-11-14 18:29:01 +09:00
Tadashi G. Takaoka
1931c1cab1
Fix language switch key behavior
...
Bug: 7075923
Change-Id: I306e1ff5d9f873541e84e1fafb64b9473947f623
2012-11-14 18:27:00 +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
Jean Chalard
f1d0b2b911
[DO NOT MERGE] Correct a wrong base character in Russian
...
Bug: 7516306
Change-Id: I80cee4b2b11e5bfa68c12923049cb612abd0bc7e
2012-11-14 15:50:28 +09:00
Satoshi Kataoka
1ee6e14507
Hide statustics logging option
...
Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
2012-11-14 14:01:52 +09:00
Jean Chalard
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
Jean Chalard
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
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
