Jean Chalard
e36af707c8
resolved conflicts for merge of b7e6bbae to master
...
Change-Id: Ic02809190721472d138532d2189328519117e042
2012-11-21 13:07:31 +09:00
Jean Chalard
82cc734925
am b9385ff9: am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
...
* commit 'b9385ff9be484487a523c1eb6db4eba33ef2359d':
Correctly add double quote to the space strippers
2012-11-20 19:42:18 -08:00
Jean Chalard
41a77f9e6e
am 37fbcb0d: am 6d471258: am c9349db1: Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
...
* commit '37fbcb0ddf2bf61f0e432534b671596b1b6f897e':
Add a constant for S_INT_MIN
2012-11-20 19:41:28 -08:00
Jean Chalard
b9385ff9be
am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
...
* commit 'cdbf6fb541aac9d57f4d27630ad0ef73814be54f':
Correctly add double quote to the space strippers
2012-11-20 19:40:09 -08:00
Jean Chalard
b7e6bbaebc
am 3acd0c7a: am f732f4dd: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
...
* commit '3acd0c7a9f4a5f17897a4fe51b023d6f14ba7ef0':
Only add spaces automatically when appropriate.
2012-11-20 19:38:47 -08:00
Jean Chalard
37fbcb0ddf
am 6d471258: am c9349db1: Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
...
* commit '6d471258b2eb15cb10b5eec04854a76881ebac5d':
Add a constant for S_INT_MIN
2012-11-20 19:38:46 -08:00
Jean Chalard
cdbf6fb541
Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
2012-11-20 19:37:54 -08:00
Jean Chalard
3acd0c7a9f
am f732f4dd: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
...
* commit 'f732f4ddccb679369b2fd2e43582b3b15aecfa1d':
Only add spaces automatically when appropriate.
2012-11-20 19:37:40 -08:00
Jean Chalard
6d471258b2
am c9349db1: Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
...
* commit 'c9349db1d2244a74c4d34025f7e0dd4922555706':
Add a constant for S_INT_MIN
2012-11-20 19:37:39 -08:00
Jean Chalard
f732f4ddcc
Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
2012-11-20 19:36:50 -08:00
Jean Chalard
c9349db1d2
Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
2012-11-20 19:36:25 -08:00
Tadashi G. Takaoka
6cc4bcedd5
am e44ce053: (-s ours) am 8a5b176f: am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE)
...
* commit 'e44ce053e724e74effc52cb2343082ce1c595073':
Add Spanish United States keyboard (DO NOT MERGE)
2012-11-20 19:00:02 -08:00
Tadashi G. Takaoka
e44ce053e7
am 8a5b176f: am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE)
...
* commit '8a5b176f655a46f1c575886a7d3a3c1120c91b29':
Add Spanish United States keyboard (DO NOT MERGE)
2012-11-20 18:58:29 -08:00
Tadashi G. Takaoka
8a5b176f65
am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE)
...
* commit 'fd1267e396d62694958569e35d0edfbc6b6ac7d3':
Add Spanish United States keyboard (DO NOT MERGE)
2012-11-20 18:56:48 -08:00
Jean Chalard
592f2b315f
Add a constant for S_INT_MIN
...
This is necessary for I807ae4bd
Bug: 7491364
Change-Id: I46ee92a76eb65e80b64538d0300b718eac6a3ddb
2012-11-20 21:25:46 +09:00
Ken Wakasa
76e5188f4e
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-20 19:41:21 +09:00
Tadashi G. Takaoka
d2266d22c9
Merge "Reorganize currency keys"
2012-11-20 02:29:37 -08:00
Tadashi G. Takaoka
c27e899dbe
Reorganize currency keys
...
Add Rial(ar), Indian Rupee(hi), Tugrik(mn), Baht(th), Hryvnia(uk),
Dong(vi) currency sign keys to symbol layout.
Bug: 7455289
Change-Id: I0f819631ff05c4a31d3a6868dea5e18a1797f103
2012-11-20 18:04:55 +09:00
Jean Chalard
c82c0d0ef2
Merge "Fix variation dumping."
2012-11-19 23:56:47 -08:00
Jean Chalard
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
Ken Wakasa
249a614ab7
Tentatively suppress -Winline for gcc 4.7
...
bug: 7584718
Change-Id: Ifcb7b6dbb5f0025fa3c44ef6023a95bd91452bc8
2012-11-20 10:27:36 +09:00
Jean Chalard
ec60d60078
Only add spaces automatically when appropriate.
...
Correctly check the variations to determine if we should
add automatic spaces (in manual picks and gestures) or not.
Bug: 7164981
Change-Id: I19e25af839b4062c217113cd804b1473912f22a5
2012-11-19 19:47:40 +09:00
Ken Wakasa
7608a4d761
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-19 19:14:34 +09:00
Jean Chalard
c5653daf72
Correctly add double quote to the space strippers
...
...without removing space, this time.
Also add a test to make sure it is working.
Bug: 7531719
Change-Id: I3afcc433c6cdc2774e7deeb6d358356db5035d35
2012-11-19 17:48:19 +09:00
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
4605ca8fdc
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-17 12:25:31 +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
Ken Wakasa
0b82582270
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-11-16 19:49:39 +09: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
