Ken Wakasa
67942c4850
am 0bf8c0bf: Merge "Create "src/utils" directory"
...
* commit '0bf8c0bf09b0e82086af5b9602fa50a7b64f0a25':
Create "src/utils" directory
2013-06-02 20:39:10 -07:00
Ken Wakasa
0bf8c0bf09
Merge "Create "src/utils" directory"
2013-06-03 03:37:41 +00:00
Ken Wakasa
addea83bad
Create "src/utils" directory
...
Change-Id: I0b7c51d181edc4786e343f7a953367b040ee6b66
2013-06-03 12:29:34 +09:00
Kurt Partridge
ef827a99d0
am a2f3f17d: Merge "Compare scrubbed strings when uncommitting LogUnits"
...
* commit 'a2f3f17de6a70e25293861b02d7a5ecf79c47907':
Compare scrubbed strings when uncommitting LogUnits
2013-06-02 20:06:46 -07:00
Kurt Partridge
a2f3f17de6
Merge "Compare scrubbed strings when uncommitting LogUnits"
2013-06-03 03:03:58 +00:00
Kurt Partridge
173ac0c60d
am 74330288: Merge "Uncommit separator LogUnits"
...
* commit '743302888b25235683c61aade88498d224d0c170':
Uncommit separator LogUnits
2013-06-02 20:03:35 -07:00
Kurt Partridge
743302888b
Merge "Uncommit separator LogUnits"
2013-06-03 03:01:23 +00:00
Kurt Partridge
a856138c49
am 3d209462: Merge "Uncommit LogUnits when reverting textInput"
...
* commit '3d2094627223dd76436e6460f43956c57053524e':
Uncommit LogUnits when reverting textInput
2013-06-02 20:00:24 -07:00
Kurt Partridge
3d20946272
Merge "Uncommit LogUnits when reverting textInput"
2013-06-03 02:58:20 +00:00
Kurt Partridge
82d98e7a48
am 4efb5c3b: Merge "Remove uncommit on reverting batch input"
...
* commit '4efb5c3b65733f985081146e018f7d4a3740c728':
Remove uncommit on reverting batch input
2013-06-02 19:55:10 -07:00
Kurt Partridge
4efb5c3b65
Merge "Remove uncommit on reverting batch input"
2013-06-03 02:54:33 +00:00
Ken Wakasa
fe712a295c
am f497e1e5: Move suggest_options.h to suggest/core
...
* commit 'f497e1e5a0be0a6268bd5f27e6f61308c69c7b63':
Move suggest_options.h to suggest/core
2013-06-02 19:49:56 -07:00
Ken Wakasa
f497e1e5a0
Move suggest_options.h to suggest/core
...
Change-Id: Ie95872a4c90ee3089183c1ebafb67243bd2688a4
2013-06-03 11:45:06 +09:00
Kurt Partridge
94ef54321e
Fix revert of committed words
...
Now that separators are put into their own LogUnits, they must be handled
when going through a revert.
Bug: 9088919
Change-Id: Ibebd0752bb2fa38d74ac96001d63070dd419cee3
2013-06-02 19:22:35 -07:00
Kurt Partridge
f07024e0fa
Compare scrubbed strings when uncommitting LogUnits
...
A LogUnit is only uncommitted if the LogUnit's word matches what is
expected. But a LogUnit never stores numbers, only scrubbed words that
replace numbers with a special character. So when uncommitting, the
text from the TextView must also be scrubbed for the comparison to pass
correctly.
Bug: 9088919
Change-Id: I9b56f10afce6d0cc84eb9ead3b9a9b1e061ae39c
2013-06-02 19:17:31 -07:00
Kurt Partridge
bdff287a0d
Uncommit separator LogUnits
...
Now that separators have their own LogUnits, they must be uncommitted
from the LogBuffer when backspacing over them.
Bug: 9088919
Change-Id: Ib36cc94939b93abe18850a06bced17caf8aaa5b9
2013-06-02 19:15:57 -07:00
Keisuke Kuroyanagi
8ff5c03bf0
am 712fefd8: Merge "Use BinaryDictonaryInfo instead of raw pointers."
...
* commit '712fefd85fa024259b81e50e98b18b749b9bde69':
Use BinaryDictonaryInfo instead of raw pointers.
2013-06-02 17:55:55 -07:00
Keisuke Kuroyanagi
712fefd85f
Merge "Use BinaryDictonaryInfo instead of raw pointers."
2013-06-03 00:51:44 +00:00
Keisuke Kuroyanagi
0ecfb94247
Use BinaryDictonaryInfo instead of raw pointers.
...
Bug: 6669677
Change-Id: I9792a872f1609de7c1ba0fc08d916047d6724c0b
2013-06-02 16:34:42 -07:00
The Android Automerger
2d2519d9e2
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-06-02 05:55:51 -07:00
Kurt Partridge
8160a21c3a
Uncommit an extra LogUnit
...
The period-generating double-space adds an extra LogUnit --
it must be removed when reverting.
Bug: 9088919
Change-Id: Ic148f40b4030a9b4a0651029bda87f7b94a52252
2013-06-02 00:02:38 -07:00
Kurt Partridge
720840851d
Uncommit LogUnits when reverting textInput
...
Bug: 9088919
Change-Id: I17187aa0afc1c3e9d32269c65f66cfb3a08663cb
2013-06-01 23:42:35 -07:00
Keisuke Kuroyanagi
12e2bd2575
am 88ad30f4: Move dictionary format independent probability calculation methods to ProbabilityUtils.
...
* commit '88ad30f40b05128d891fd412bb684bdbdc514446':
Move dictionary format independent probability calculation methods to ProbabilityUtils.
2013-06-01 20:28:48 -07:00
Keisuke Kuroyanagi
88ad30f40b
Move dictionary format independent probability calculation methods to ProbabilityUtils.
...
Bug: 6669677
Change-Id: Idc09a2fbb04e4d843e11313011178022177616aa
2013-06-01 14:08:20 -07:00
Kurt Partridge
4165ef031f
Remove uncommit on reverting batch input
...
Currently when the user reverts a batch input, a LogUnit is uncommitted
from the LogBuffer. It should not be, because the LogUnit containing the
batch input is never committed in the first place (it is only committed
to the LogBuffer when a key is pressed or a new batch input is entered).
Bug: 9088919
Change-Id: I323af453ce082437a663ccae977b21b775a964bc
2013-06-01 11:15:47 -07:00
Baligh Uddin
8c5fec2bd8
am d3ccd4bf: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'd3ccd4bf22c01c02edbed1b6642569d6110167fb':
Import translations. DO NOT MERGE
2013-06-01 08:21:16 -07:00
Baligh Uddin
d3ccd4bf22
Merge "Import translations. DO NOT MERGE"
2013-05-31 23:19:22 +00:00
Ken Wakasa
f80e2abb0c
am 1dae936f: Merge "Move char_utils to the dictionary directory"
...
* commit '1dae936f23026d3eeec1f4511303104128d5da5f':
Move char_utils to the dictionary directory
2013-05-31 04:43:34 -07:00
Ken Wakasa
1dae936f23
Merge "Move char_utils to the dictionary directory"
2013-05-31 11:41:33 +00:00
Ken Wakasa
464d3ba432
Move char_utils to the dictionary directory
...
Change-Id: Id397485407fe63600c9bb5c80d223042942b4d8a
2013-05-31 20:39:34 +09:00
Jean Chalard
f6a4670d1c
am 26f48949: Fix the displayed status after download
...
* commit '26f489493eb3a1ccb9cb0ab55627bee4c74a6fd2':
Fix the displayed status after download
2013-05-31 04:29:58 -07:00
Jean Chalard
26f489493e
Fix the displayed status after download
...
Bug: 9166225
Change-Id: I7490593d88a5854b9e675b9ead89d2ea9b49315c
2013-05-31 20:28:15 +09:00
Jean Chalard
fcdb85b37a
am f61999ca: Merge "Make it easy to open several dictionaries from tests"
...
* commit 'f61999caba1fa720c6817da8b6fc129d16b9a954':
Make it easy to open several dictionaries from tests
2013-05-31 04:23:33 -07:00
Jean Chalard
f61999caba
Merge "Make it easy to open several dictionaries from tests"
2013-05-31 11:21:37 +00:00
Tadashi G. Takaoka
8a7acf147d
am a0c3e02d: Refactor SuggestionStripLayoutHelper a bit
...
* commit 'a0c3e02d7168dd4cee4cad51491537dadb0362cc':
Refactor SuggestionStripLayoutHelper a bit
2013-05-31 02:36:56 -07:00
Tadashi G. Takaoka
a0c3e02d71
Refactor SuggestionStripLayoutHelper a bit
...
Bug: 9059710
Change-Id: Ief12029bad75d4dc78090ab97555aece01b873de
2013-05-31 18:14:47 +09:00
Tadashi G. Takaoka
0ef1e6234c
am 70c2dcff: am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit '70c2dcffa3fdce8040d0779dd173d5634e434cba':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:50:37 -07:00
Baligh Uddin
1ba6866408
am 5989c9b8: (-s ours) am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE
...
* commit '5989c9b8100615fd77d9cb75a63ea707e411da8a':
Import translations. DO NOT MERGE
2013-05-30 23:50:35 -07:00
Tadashi G. Takaoka
70c2dcffa3
am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit '6f7e39a6827598492ffbfeedf4c47445519f272e':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:49:07 -07:00
Baligh Uddin
5989c9b810
am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ea11a8ef4f6c2753b01bb80423abe0263bb1b7d3':
Import translations. DO NOT MERGE
2013-05-30 23:49:06 -07:00
Tadashi G. Takaoka
6f7e39a682
am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit 'e7514a6a8a9e59ea5cde9f2c3a198f35d111cdc2':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:47:01 -07:00
Baligh Uddin
ea11a8ef4f
am dee9d17c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dee9d17c6855b9d34a9cd0e7946c5890a83a583b':
Import translations. DO NOT MERGE
2013-05-30 23:47:01 -07:00
Tadashi G. Takaoka
e7514a6a8a
Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
2013-05-31 06:45:07 +00:00
Jean Chalard
1562fc91f0
Make it easy to open several dictionaries from tests
...
Bug: 9127175
Change-Id: I3f1840ee73b364df26dfddb5acb10001e0f2cb61
2013-05-31 15:36:05 +09:00
Tadashi G. Takaoka
015d542fa9
am 723391c9: Merge "Tidy up Utils class a bit"
...
* commit '723391c9451f906ed786ba3418611846dfe9f3f5':
Tidy up Utils class a bit
2013-05-30 23:30:48 -07:00
Tadashi G. Takaoka
723391c945
Merge "Tidy up Utils class a bit"
2013-05-31 06:29:24 +00:00
Keisuke Kuroyanagi
68d17aea65
am f88f9dbb: Move "#define LOG_TAG" before include defines.h.
...
* commit 'f88f9dbbdec309c01feda06edc142470ba13cb2f':
Move "#define LOG_TAG" before include defines.h.
2013-05-30 22:29:40 -07:00
Keisuke Kuroyanagi
f88f9dbbde
Move "#define LOG_TAG" before include defines.h.
...
Change-Id: Iacd2c2ea3878ad2cde5df36b15e1359d10244f60
2013-05-30 22:26:21 -07:00
Kurt Partridge
502ff08512
am e6125db9: Merge "Catch a permission exception"
...
* commit 'e6125db98d9e61841a4bde791ff0d9aed151f126':
Catch a permission exception
2013-05-30 17:31:37 -07:00
Kurt Partridge
e6125db98d
Merge "Catch a permission exception"
2013-05-31 00:30:14 +00:00