Tadashi G. Takaoka
4c6e8e70fb
am 5fc43eb0: am 1e491d90: Merge "Use fragment for advanced preference screen" into lmp-dev
...
* commit '5fc43eb04df9870fb6256d8d3918e7d399ca8a79':
Use fragment for advanced preference screen
2014-07-28 12:14:28 +00:00
Keisuke Kuroyanagi
4de1ca67d7
am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
...
* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':
Fix NPE when context.getFilesDir() returns null.
2014-07-28 12:14:26 +00:00
Tadashi G. Takaoka
cd4799fdf9
am 1f5881b7: am 9ba85413: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
...
* commit '1f5881b752b9b8e527b00e14150cfedd916513ce':
Refactor Debug settings to use SubScreenFragment
2014-07-28 12:14:25 +00:00
Tadashi G. Takaoka
a8765daeec
am b1067103: am 633f1a5e: Merge "Use fragment for text correction preference screen" into lmp-dev
...
* commit 'b1067103343c9b196e0a9276f3e9f7c20b6def86':
Use fragment for text correction preference screen
2014-07-28 12:14:24 +00:00
Tadashi G. Takaoka
2d64f7c097
am f63a044c: am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
...
* commit 'f63a044c6649f3cabc3b612ed5bd79b6601f52ae':
Use fragment for gesture typing preference screen
2014-07-28 12:14:23 +00:00
Tadashi G. Takaoka
a0a37bd368
am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit 'beffde59c36515f77946b35c2b0279413a1df69f':
Use fragment for multi lingual preference screen
2014-07-28 12:14:21 +00:00
Jean Chalard
d33f7e84ab
am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit 'ac82983f65626c1db3fd878ba059807166ffbe36':
Fix a verifier error on ICS.
2014-07-28 12:14:20 +00:00
Tadashi G. Takaoka
081a4177e4
am c140938d: am bfcd98ed: Use fragment for input preference screen
...
* commit 'c140938d99b2b34e95d7e45425396f280a486043':
Use fragment for input preference screen
2014-07-28 12:14:19 +00:00
Tadashi G. Takaoka
4dba300e50
am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit '26a2986581410536a98e1c311214dc90d9934546':
Make "Show correction suggestions" as a binary option
2014-07-28 12:14:18 +00:00
Jean Chalard
b6a75d10de
am 036b83f4: Merge "Wait for an event before actually realizing it" into lmp-dev
...
* commit '036b83f4c44169703273b4e8192809fdadd7b8ad':
Wait for an event before actually realizing it
2014-07-28 12:09:16 +00:00
Tadashi G. Takaoka
5fc43eb04d
am 1e491d90: Merge "Use fragment for advanced preference screen" into lmp-dev
...
* commit '1e491d90f9b26430f55a9dfee031007acf3d727b':
Use fragment for advanced preference screen
2014-07-28 12:09:15 +00:00
Keisuke Kuroyanagi
0bad998c52
am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
...
* commit 'fb15b768dd21a7364a541e898886166177617c58':
Fix NPE when context.getFilesDir() returns null.
2014-07-28 12:09:09 +00:00
Tadashi G. Takaoka
1f5881b752
am 9ba85413: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
...
* commit '9ba854133cf06b28111980908373e173a8b26938':
Refactor Debug settings to use SubScreenFragment
2014-07-28 12:09:08 +00:00
Tadashi G. Takaoka
b106710334
am 633f1a5e: Merge "Use fragment for text correction preference screen" into lmp-dev
...
* commit '633f1a5e6ed6dee09b01449a23f7bab3953c99d3':
Use fragment for text correction preference screen
2014-07-28 12:09:07 +00:00
Tadashi G. Takaoka
f63a044c66
am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
...
* commit 'a484dc84d92839e821e7aa7de03c12495d566229':
Use fragment for gesture typing preference screen
2014-07-28 12:09:06 +00:00
Tadashi G. Takaoka
beffde59c3
am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit '1da438549368e74d55017c36d666673ad608a5c4':
Use fragment for multi lingual preference screen
2014-07-28 12:09:05 +00:00
Jean Chalard
ac82983f65
am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit '6d7a08107cd62620a2a07d445686e76c2d660bcf':
Fix a verifier error on ICS.
2014-07-28 12:09:04 +00:00
Tadashi G. Takaoka
c140938d99
am bfcd98ed: Use fragment for input preference screen
...
* commit 'bfcd98edc7c5ac28fdc1e4b7a97b2912124e622a':
Use fragment for input preference screen
2014-07-28 12:09:03 +00:00
Tadashi G. Takaoka
26a2986581
am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit 'ab661e3ef886a36b02fe094864ae4be6a3260f71':
Make "Show correction suggestions" as a binary option
2014-07-28 12:09:02 +00:00
Tadashi G. Takaoka
bfcd98edc7
Use fragment for input preference screen
...
This CL introduces a common abstract class, SunScreenFragment, for
PreferenceFragment that implements a PreferenceScreen of the main
settings preference screen.
Bug: 16522808
Change-Id: I11fba71b5e9f96208b261e0c0314de8a41720d0f
2014-07-27 16:06:52 +09:00
Tadashi G. Takaoka
ab661e3ef8
Make "Show correction suggestions" as a binary option
...
Formerly "Show correction suggestions" had three options, "always
show", "show in portrait mode", and "always hide". The reason behind
"show in portrait mode" was that there may not be enough screen estate
in landscape mode to show suggestions. Because recent phone devices
have relatively large screen, we decide to remove "show in portrait
mode" option.
Bug: 15780939
Change-Id: I896d737452c3893d43ce20bd88127f10c1eb3d83
2014-07-27 14:47:07 +09:00
Ken Wakasa
e8ca3f4091
Merge "Revert "[HW10] Pull the processed event in its eventual place"" into lmp-dev
2014-07-25 11:19:20 +00:00
Ken Wakasa
79fd911c8d
Revert "[HW10] Pull the processed event in its eventual place"
...
This reverts commit bcb61da581
.
Reverting due to a few critical bugs and unit test failures.
Change-Id: I5f7ee2c7883496ed36e56b3ef12fac91f85f9866
2014-07-30 00:29:41 +00:00
Jean Chalard
312c9498be
Merge "[HW8] Pull up the processed event." into lmp-dev
2014-07-25 11:19:20 +00:00
Jean Chalard
ebdd641d58
[HW8] Pull up the processed event.
...
Change-Id: If4baba0af2e88627f22b5e7312948fc3d9c5a25f
2014-07-29 17:49:24 +09:00
Jean Chalard
60a2cd8ac4
[HW7.5] Introduce the @Nonnull annotation
...
Change-Id: I1f69ea704056943fa3371ff610e2d8181ead2376
2014-07-29 17:49:19 +09:00
Jean Chalard
99aff0af98
[HW7] Introduce consumed events
...
Change-Id: Ic2d95d19b1ac66e3e97e4a16187ce5aecb4ac678
2014-07-29 17:49:14 +09:00
Jean Chalard
1db3d860ca
[HW6] Split processing and applying the event.
...
If anyone has better names for those...
Change-Id: Ia2dfc75381816bd688948647e2c50c10657b9e89
2014-07-29 17:40:48 +09:00
Jean Chalard
3042452170
Merge "[HW7] Introduce consumed events" into lmp-dev
2014-07-25 11:19:20 +00:00
Keisuke Kuroyanagi
6c3b0d3caa
Merge "Add TrieMap." into lmp-dev
2014-07-25 11:19:20 +00:00
Keisuke Kuroyanagi
de3121dead
Add TrieMap.
...
Bug: 14425059
Change-Id: Ief36f808ed4f3e35bfab07837ea314d2564973ab
2014-07-29 17:00:29 +09:00
Jean Chalard
6c39db9f72
Merge "[HW6] Split processing and applying the event." into lmp-dev
2014-07-25 11:19:20 +00:00
Keisuke Kuroyanagi
179f38cc8c
Merge "Change getUnigramProbabilityOfPtNode to getProbabilityOfPtNode()" into lmp-dev
2014-07-25 11:19:20 +00:00
Keisuke Kuroyanagi
96d47fe745
Change getUnigramProbabilityOfPtNode to getProbabilityOfPtNode()
...
Bug: 14425059
Change-Id: I92403d750d2979408b41554dcd79b0ed31b41161
2014-07-29 11:35:57 +09:00
Jean Chalard
76ad259764
Merge "Improve the russian dictionary." into lmp-dev
2014-07-25 11:19:20 +00:00
Jean Chalard
ae41058659
Improve the russian dictionary.
...
Deleted: 38 words
Probability adjusted: 11 words
Added: 1299 words
[Category diff]
+1 15
-1 0
+2 0
-2 0
+3 0
-3 0
+4 0
-4 0
+5 0
-5 3
+6 1
-6 0
+7 0
-7 13
[Weighted category diff]
+1 15
-1 0
+2 0
-2 0
+3 0
-3 0
+4 0
-4 0
+5 0
-5 3
+6 1
-6 0
+7 0
-7 13
Change-Id: I1a6513954d60b30738cb849578ce535c5e05eb1a
2014-07-29 13:31:23 +09:00
Keisuke Kuroyanagi
c6862ee699
Merge "Allow adding DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev
2014-07-25 11:19:20 +00:00
Keisuke Kuroyanagi
d9a8f2a82f
Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.
...
Bug: 12725817
Change-Id: Ib9b30473ba94242a7b97ccd3b850068f596a5d17
2014-07-28 21:48:02 +09:00
Keisuke Kuroyanagi
3225b6fe66
Add boundary check for ver2 bigram reading.
...
Bug: 16330528
Change-Id: I6aca6c7a735e2a652eb325572d44dff660789cff
2014-07-28 21:48:00 +09:00
Jean Chalard
036b83f4c4
Merge "Wait for an event before actually realizing it" into lmp-dev
2014-07-25 11:19:20 +00:00
Jean Chalard
3d951c1eff
Wait for an event before actually realizing it
...
This would wrongly emit a 'timeout' log entry when switching
between two instances of the same language.
Change-Id: I56e5de121b87f3e762b58f0b2a77e9abc784036e
2014-07-28 19:33:49 +09:00
Keisuke Kuroyanagi
370ffb424f
am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '825243bfdd6fb63c2ef8bf99024bb06e6f52e946':
Add BufferWithExtendablebufferTest
2014-07-24 23:37:03 +00:00
Keisuke Kuroyanagi
90ac50ee43
am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit 'dfbe2a8ca80ef73a0bc1364cf5964db2141a2a86':
Add BufferWithExtendableBuffer::extend()
2014-07-24 23:36:16 +00:00
Keisuke Kuroyanagi
16665da280
am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit 'f78eb27c7e563d0bbe10239ec7d9941fd170e597':
Refactoring checkAndPrepareWriting.
2014-07-24 23:35:45 +00:00
Tim Murray
da9cc77339
resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
2014-07-24 14:21:52 -07:00
Baligh Uddin
2dc3a51001
Merge "Import translations. DO NOT MERGE"
2014-07-24 20:48:02 +00:00
Keisuke Kuroyanagi
862fa431df
am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '370ffb424f4d03143c7e5d8186206e58e6fb4021':
Add BufferWithExtendablebufferTest
2014-07-24 23:59:07 +00:00
Keisuke Kuroyanagi
917f8002c0
am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit '90ac50ee433d7ecb1a89da242d0d99b882169d17':
Add BufferWithExtendableBuffer::extend()
2014-07-24 23:59:06 +00:00
Keisuke Kuroyanagi
e32cb6f8f2
am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit '16665da28091f977e92dd0382eb3adefc8478f36':
Refactoring checkAndPrepareWriting.
2014-07-24 23:59:05 +00:00
Tim Murray
ea3bc5caac
am da9cc773: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
Use default compiler flags for dicttool.
2014-07-24 21:25:56 +00:00