Ken Wakasa
f63000abea
Revert "Use std::min() and std::max()"
...
This somehow breaks TRT.
bug: 13350753
This reverts commit cf612a3abf
.
Change-Id: I812f067e7cc8106b054527732dc6fe4efd7cc0fe
2014-03-07 02:30:18 +00:00
Keisuke Kuroyanagi
6c7ebc4023
Use nullptr instead of 0 for pointers.
...
Change-Id: Ic9425de07b896f940ca11c51968c637ebb897514
2014-03-07 10:04:44 +09:00
Baligh Uddin
73105cc079
am 1df1f56e: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '1df1f56ec5b5c14fbc9ff1013ed9007981abff41':
Import translations. DO NOT MERGE
2014-03-06 14:15:49 -08:00
Baligh Uddin
1df1f56ec5
Merge "Import translations. DO NOT MERGE"
2014-03-06 21:14:52 +00:00
Baligh Uddin
70696b41f3
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2014-03-06 21:14:43 +00:00
Ken Wakasa
cd58af7ea8
am 34c65320: Merge "Use std::min() and std::max()"
...
* commit '34c653204cf9f5655700c94df47852e7b59ff742':
Use std::min() and std::max()
2014-03-06 07:10:39 -08:00
Ken Wakasa
34c653204c
Merge "Use std::min() and std::max()"
2014-03-06 15:08:14 +00:00
Ken Wakasa
563aef07c8
am c2908884: Fix Mac SDK build
...
* commit 'c29088846195dd413f086d9f7e602e185eebb995':
Fix Mac SDK build
2014-03-06 06:51:08 -08:00
Ken Wakasa
c290888461
Fix Mac SDK build
...
Temporary fix.
Change-Id: I79c8c31e7b07776a048a16918008a942261e1115
2014-03-06 23:41:23 +09:00
Ken Wakasa
cf612a3abf
Use std::min() and std::max()
...
Change-Id: I2992fa16692ace2a6febedc4393812faf763638f
2014-03-06 23:19:54 +09:00
Tadashi G. Takaoka
b60d09bca0
am eba0af12: Merge "Add ExpectedKeyboardBuilder for testing keyboard layouts"
...
* commit 'eba0af1237c31e90a2431d1a4aa174acb83bafb2':
Add ExpectedKeyboardBuilder for testing keyboard layouts
2014-03-06 04:37:00 -08:00
Tadashi G. Takaoka
eba0af1237
Merge "Add ExpectedKeyboardBuilder for testing keyboard layouts"
2014-03-06 12:34:49 +00:00
Yohei Yukawa
5677793822
am 72c36298: Use C++11 deleted functions to implement DISALLOW_ macros
...
* commit '72c362985cdafacfe9411aa700666bc0be556483':
Use C++11 deleted functions to implement DISALLOW_ macros
2014-03-06 04:23:14 -08:00
Yohei Yukawa
72c362985c
Use C++11 deleted functions to implement DISALLOW_ macros
...
With C++ deleted functions, compilers can generate more
descriptive error messages when we are doing something disallowed.
Change-Id: I48d23e5eced545732558e56f5ff9ff70c95a6ff0
2014-03-06 20:48:43 +09:00
Ken Wakasa
566e944f39
am ca0a0da8: Switch to C++11
...
* commit 'ca0a0da8640d1469cb460120ff0aede2322c6802':
Switch to C++11
2014-03-06 03:38:14 -08:00
Ken Wakasa
ca0a0da864
Switch to C++11
...
Change-Id: Ib2970327c36422d7b11103d52ba7e9e52db5554f
2014-03-06 20:32:20 +09:00
Tadashi G. Takaoka
f7c84f35c7
Add ExpectedKeyboardBuilder for testing keyboard layouts
...
Bug: 13017434
Change-Id: I77ea2a60b1f3adf061689c68971d136ea5cf595e
2014-03-06 19:32:43 +09:00
Tadashi G. Takaoka
e5cac37319
am 51523c3b: Merge "Add ExpectedKey for testing keyboard layouts"
...
* commit '51523c3bc4147e07e787a952ef64a326b5bccafa':
Add ExpectedKey for testing keyboard layouts
2014-03-06 02:28:13 -08:00
Tadashi G. Takaoka
51523c3bc4
Merge "Add ExpectedKey for testing keyboard layouts"
2014-03-06 10:25:31 +00:00
Keisuke Kuroyanagi
3ad4af2354
Move DictionaryOptions from FusionDictionary to FormatSpec.
...
Bug: 8187060
Bug:13035567
Change-Id: Id4f45e589521ae98c926a4c0607be10ce1a983f2
2014-03-06 18:53:09 +09:00
Keisuke Kuroyanagi
516f86815d
Separate WeightedString from FusionDictionary.
...
Bug: 8187060
Change-Id: I40c1dafca3eb52244c64fdb4c1db30a56385d678
2014-03-06 18:53:06 +09:00
Keisuke Kuroyanagi
769051c2e2
am de42f3f2: Merge "Fix: Bug of I39e905b6ddfc8d3."
...
* commit 'de42f3f287529a05899cc27d485d119dbbc3863d':
Fix: Bug of I39e905b6ddfc8d3.
2014-03-06 01:47:25 -08:00
Keisuke Kuroyanagi
de42f3f287
Merge "Fix: Bug of I39e905b6ddfc8d3."
2014-03-06 09:44:52 +00:00
Jean Chalard
2f8258e3ea
am 3892991b: Merge "[IL124] Remove the KeyboardSwitcher arg to onCodeInput"
...
* commit '3892991b80b1962454789f7233171620f70fb22b':
[IL124] Remove the KeyboardSwitcher arg to onCodeInput
2014-03-06 01:37:47 -08:00
Keisuke Kuroyanagi
9fd50e34a8
Fix: Bug of I39e905b6ddfc8d3.
...
primaryKey have to be the first elemnet of the proximities.
Bug: 13315755
Change-Id: I6c94408a2ef2750fa85ff12b93bed8b8d874717e
2014-03-06 18:25:15 +09:00
Jean Chalard
3892991b80
Merge "[IL124] Remove the KeyboardSwitcher arg to onCodeInput"
2014-03-06 09:15:26 +00:00
Tadashi G. Takaoka
c39c912a33
Add ExpectedKey for testing keyboard layouts
...
Bug: 13017434
Change-Id: I1c3b2c9cd1b86bdd782fc522b83380ec112f863b
2014-03-06 18:13:28 +09:00
Jean Chalard
f845b8d576
am 4da06b9a: Merge "Correctly update the suggestion strip on non-resumable word"
...
* commit '4da06b9a1957dcd9a937cc64ab17c84061b87ea7':
Correctly update the suggestion strip on non-resumable word
2014-03-06 00:56:42 -08:00
Jean Chalard
4da06b9a19
Merge "Correctly update the suggestion strip on non-resumable word"
2014-03-06 08:54:44 +00:00
Keisuke Kuroyanagi
f0922a9194
am 2c7e97dc: Merge "Create suggest/core/result directory."
...
* commit '2c7e97dcdd2201a26b16b81f9d7fe6fcf8d49262':
Create suggest/core/result directory.
2014-03-05 23:34:17 -08:00
Keisuke Kuroyanagi
2cb31a0f23
am d93eb680: Merge "Use BinaryDictionaryUtils to read dictionary header."
...
* commit 'd93eb680c463f6258f8b9e31bb379545b8679357':
Use BinaryDictionaryUtils to read dictionary header.
2014-03-05 23:34:14 -08:00
Keisuke Kuroyanagi
2c7e97dcdd
Merge "Create suggest/core/result directory."
2014-03-06 07:32:19 +00:00
Keisuke Kuroyanagi
d93eb680c4
Merge "Use BinaryDictionaryUtils to read dictionary header."
2014-03-06 07:32:07 +00:00
Keisuke Kuroyanagi
fb1588dd3c
Create suggest/core/result directory.
...
Bug: 8187060
Bug: 13333066
Change-Id: I185c93bd4542d997be101b61561a00d69111c00d
2014-03-06 14:35:47 +09:00
Jean Chalard
ea3c70ebe2
am db38d5cf: [IL123] Put the settings values inside the transaction
...
* commit 'db38d5cf632e6e20178ca3bc1603eabd71c74d41':
[IL123] Put the settings values inside the transaction
2014-03-05 21:28:25 -08:00
Jean Chalard
a1bf550294
[IL124] Remove the KeyboardSwitcher arg to onCodeInput
...
Bug: 8636060
Change-Id: I29ce4c82ea880a937b1c9e5daf494fcdbbdd1336
2014-03-06 14:20:41 +09:00
Jean Chalard
db38d5cf63
[IL123] Put the settings values inside the transaction
...
A transaction should always operate with a consistent set
of settings. It's better to have it reference them than to
always pass them along.
Bug: 8636060
Change-Id: I3c642dfea6be30712fc6cbb279c64f3185895791
2014-03-06 14:20:37 +09:00
Jean Chalard
21ac406d9f
am 50545309: Merge "[IL122] Put the code, x and y in the transaction"
...
* commit '505453093443ce60ee4366e1343098a0e3244d36':
[IL122] Put the code, x and y in the transaction
2014-03-05 19:56:40 -08:00
Jean Chalard
5054530934
Merge "[IL122] Put the code, x and y in the transaction"
2014-03-06 03:55:00 +00:00
Jean Chalard
29881854bc
[IL122] Put the code, x and y in the transaction
...
Bug: 8636060
Change-Id: Icdf87995dedec410b54c306e8d312ba7ec25cea6
2014-03-06 12:50:07 +09:00
Tadashi G. Takaoka
4487477d27
am dbe531ef: Merge "Remove unused text resource keylabel_for_east_slavic_row1_12"
...
* commit 'dbe531efa8f369d8630b06c85bc190ab6d298e82':
Remove unused text resource keylabel_for_east_slavic_row1_12
2014-03-05 18:49:09 -08:00
Tadashi G. Takaoka
dbe531efa8
Merge "Remove unused text resource keylabel_for_east_slavic_row1_12"
2014-03-06 02:47:06 +00:00
Baligh Uddin
0b3f8935b5
Import translations. DO NOT MERGE
...
Change-Id: I7a730021b1c38c8ef7aa62b567a68a7cc478e516
Auto-generated-cl: translation import
2014-03-05 17:17:49 -08:00
Baligh Uddin
e1524228a4
Import translations. DO NOT MERGE
...
Change-Id: I7ae8d37ad62bb2f7f1ea48c18c1aec5aa8d98ab5
Auto-generated-cl: translation import
2014-03-05 17:15:48 -08:00
Keisuke Kuroyanagi
de36b47d29
Use BinaryDictionaryUtils to read dictionary header.
...
Bug: 8187060
Bug:13035567
Change-Id: I90a5e0665c367f5a1bd786f4babf0d03e79e68fa
2014-03-05 19:42:53 +09:00
Keisuke Kuroyanagi
3b14961f20
am a84f7848: Merge "Fix: The top left key is a proximity of nonexistent keys."
...
* commit 'a84f7848d8da240137ca57a8e2100e6b09bfc7aa':
Fix: The top left key is a proximity of nonexistent keys.
2014-03-05 02:29:35 -08:00
Keisuke Kuroyanagi
a84f7848d8
Merge "Fix: The top left key is a proximity of nonexistent keys."
2014-03-05 10:27:27 +00:00
Keisuke Kuroyanagi
99bba3ee1b
am 274eae95: Merge "Separate utility methods from BinaryDictionary."
...
* commit '274eae95ba78848632afb60394105057e9cfce78':
Separate utility methods from BinaryDictionary.
2014-03-05 02:10:05 -08:00
Keisuke Kuroyanagi
274eae95ba
Merge "Separate utility methods from BinaryDictionary."
2014-03-05 10:07:33 +00:00
Keisuke Kuroyanagi
6501255111
Fix: The top left key is a proximity of nonexistent keys.
...
Bug: 13315755
Change-Id: I39e905b6ddfc8d3510c408a3bea853390a75d088
2014-03-05 19:06:18 +09:00