Tadashi G. Takaoka
120b64f617
Merge "Add Spanish United States keyboard"
2012-11-18 22:50:53 -08:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
fd1267e396
Add Spanish United States keyboard (DO NOT MERGE)
...
Bug: 7531804
Change-Id: Idd66ee30e5228260540308a97c930185b48e775f
2012-11-19 11:27:07 +09:00
Ken Wakasa
97ff1714e2
Tidy up the base char map
...
Change-Id: I1c3119c5db35faaf73180f17a0888224e301c121
2012-11-19 00:24:45 +09:00
Ken Wakasa
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
Ken Wakasa
41a2c10e72
resolved conflicts for merge of 4ad92578 to master
...
Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef
2012-11-17 11:33:48 +09:00
Ken Wakasa
f5a194b6af
Revert "Correctly add double quote to the space strippers"
...
This reverts commit af7264abb7
2012-11-16 18:33:44 -08:00
Ken Wakasa
06993cb019
Revert "Only add spaces automatically when appropriate."
...
This reverts commit 6ce66d1c7d
2012-11-16 18:33:29 -08:00
Ken Wakasa
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
Ken Wakasa
1f256e941b
am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
...
* commit '66cee1f92de0413756b8f306275d3508cd2b040f':
Revert "Correctly add double quote to the space strippers"
2012-11-16 18:23:53 -08:00
Ken Wakasa
66cee1f92d
Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
2012-11-16 18:20:49 -08:00
Ken Wakasa
86e554739f
Revert "Correctly add double quote to the space strippers"
...
This reverts commit af7264abb7
2012-11-16 18:17:10 -08:00
Ken Wakasa
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
Ken Wakasa
7acd310d02
am f9ff4fb5: Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
...
* commit 'f9ff4fb5da5971bd02eec491a497006540e1438a':
Revert "Only add spaces automatically when appropriate."
2012-11-16 18:03:47 -08:00
Ken Wakasa
f9ff4fb5da
Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
2012-11-16 18:00:15 -08:00
Ken Wakasa
5986931fcb
Revert "Only add spaces automatically when appropriate."
...
This reverts commit 6ce66d1c7d
2012-11-16 17:49:22 -08:00
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
