Commit graph

31544 commits

Author SHA1 Message Date
The Android Automerger
fea8accffa merge in master-release history after reset to master 2014-03-09 05:49:42 -07:00
The Android Automerger
627e97f7a7 merge in master-release history after reset to master 2014-03-08 05:50:57 -08:00
Ken Wakasa
783aee47e0 Remove string-arrays that are getting in the way
These empty string-arrays should not have been in this resource file.
They are in the translated files, and they are getting in the way of
the resource finding paths.

Fundamental fixes definitely should follow. For now, this CL should be
safe and acceptable for Cannellini.

bug: 13340486
Change-Id: I14c36babf9eb30cfc1c0adc5977136189a305f33
2014-03-08 22:37:27 +09:00
Keisuke Kuroyanagi
f14cf3e64c Fix: dicttool build.
Change-Id: I5c3bcbe9f3054bdd1a760398fe11344e0e05ac6a
2014-03-07 13:01:48 +00:00
Keisuke Kuroyanagi
32326a9d7a Merge "Move DictionaryOptions from FusionDictionary to FormatSpec." 2014-03-07 10:42:18 +00:00
Keisuke Kuroyanagi
ee5d8441d1 Merge "Introduce SuggestionResults and use it for predictions." 2014-03-07 10:38:22 +00:00
Keisuke Kuroyanagi
e137ec0a91 Introduce SuggestionResults and use it for predictions.
Bug: 8187060
Bug: 13333066
Change-Id: I1ead897024508b7e40fbd93af7d14bfe74b93826
2014-03-07 19:36:19 +09:00
Tadashi G. Takaoka
a0a8d96c49 Merge "Filter Spacer before keyboard layout test" 2014-03-07 10:33:37 +00:00
Tadashi G. Takaoka
8c6b34e51d Filter Spacer before keyboard layout test
Bug: 13017434
Change-Id: I836d2f79a839ee77325535c08d7a59bb02b83c28
2014-03-07 19:18:51 +09:00
Keisuke Kuroyanagi
a103e29d00 Merge "Separate WeightedString from FusionDictionary." 2014-03-07 09:07:26 +00:00
Keisuke Kuroyanagi
c36c97b4f7 Merge "Use unique_ptr." 2014-03-07 09:06:58 +00:00
Tadashi G. Takaoka
0dc53b0699 Add en_US keyboard layout test
Bug: 13017434
Change-Id: I3fb343721221ecae210bffcb3e83ce4f2df0d0ff
2014-03-07 17:44:36 +09:00
Tadashi G. Takaoka
238e9898cd Add QWERTY expected keyboard layouts
Bug: 13017434
Change-Id: Ia8a65b692521f0050f003e20712a5873a0b236b4
2014-03-07 17:39:54 +09:00
Tadashi G. Takaoka
ad04ed5460 Merge "Add ActualKeyboardBuilder for testing keyboard layouts" 2014-03-07 08:36:43 +00:00
Tadashi G. Takaoka
ff8405cdfb Add ActualKeyboardBuilder for testing keyboard layouts
Bug: 13017434
Change-Id: I38b1f5c261ea1f3ff312c780d7d9b5fe3fba8aaf
2014-03-07 17:29:58 +09:00
Ken Wakasa
6767f88e3c Address warnings pointed out by clang
Change-Id: I7943f6c7f9ba08f283a3116adc2af29495f04a21
2014-03-07 17:05:09 +09:00
Ken Wakasa
2bebda2fa7 Merge "Recover the dicttool build except for Mac" 2014-03-07 06:14:07 +00:00
Ken Wakasa
344742b0d1 Recover the dicttool build except for Mac
With a hack: Temporarily disable host tool build on Mac until the
build system is ready for C++11.

Change-Id: Ib412ba0d7fecc968cc09b4d8fde4e838bdc0618a
2014-03-07 15:04:27 +09:00
Keisuke Kuroyanagi
9c2f003d59 Merge "Revert "Revert "Use std::min() and std::max()""" 2014-03-07 05:33:30 +00:00
Tadashi G. Takaoka
937c40ee00 Merge "Fix AZERTY/tablet layout" 2014-03-07 05:32:05 +00:00
Keisuke Kuroyanagi
4ce480d5ce Use unique_ptr.
Change-Id: Id92a5b07da4f7f95e2cd293ce8dc1a5f979b7853
2014-03-07 14:31:54 +09:00
Tadashi G. Takaoka
a4fe6a8dba Fix AZERTY/tablet layout
Bug: 13351429
Change-Id: I599627a78397e5bbae689c1aec3a3f11b72a834f
2014-03-07 14:29:30 +09:00
Keisuke Kuroyanagi
865e6cf497 Revert "Revert "Use std::min() and std::max()""
This reverts commit f63000abea.

Change-Id: I6056d176a13c6ecad38e658ab8778bd898291d02
2014-03-07 14:19:56 +09:00
Keisuke Kuroyanagi
a1e0ef4836 Fix: point to line segment distance can be NaN.
Change-Id: I7db6bfea925a0eda82bfb1f7b5e1110b193dabdb
2014-03-07 14:19:52 +09:00
Keisuke Kuroyanagi
3339224813 Merge "Use nullptr instead of 0 for pointers." 2014-03-07 03:56:56 +00:00
Ken Wakasa
ce2ac1c835 Merge "Revert "Use std::min() and std::max()"" 2014-03-07 02:37:05 +00:00
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
1df1f56ec5 Merge "Import translations. DO NOT MERGE" 2014-03-06 21:14:52 +00:00
Ken Wakasa
34c653204c Merge "Use std::min() and std::max()" 2014-03-06 15:08:14 +00: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
The Android Automerger
b0aa960103 merge in master-release history after reset to master 2014-03-06 05:50:27 -08:00
Tadashi G. Takaoka
eba0af1237 Merge "Add ExpectedKeyboardBuilder for testing keyboard layouts" 2014-03-06 12:34:49 +00: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
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
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
de42f3f287 Merge "Fix: Bug of I39e905b6ddfc8d3." 2014-03-06 09:44:52 +00: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
4da06b9a19 Merge "Correctly update the suggestion strip on non-resumable word" 2014-03-06 08:54:44 +00: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
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