The Android Open Source Project
0532b398ad
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I8e30c075ddfaf3712aacd89a2a90c30ea245193a
2013-06-03 14:04:13 -07:00
Tadashi G. Takaoka
cbc7acb6f5
Merge "Expand suggestion strip when center suggestion is long"
2013-06-03 14:45:05 +00:00
Kurt Partridge
763fd9d5e9
Merge "Fix revert of committed words"
2013-06-03 13:03:26 +00:00
Ken Wakasa
156d39303e
Remove a bunch macros that are no longer used
...
bug: 8550444
Change-Id: Ib775c0bed27c499dc131c54dfaff34c5a8169276
2013-06-03 20:00:02 +09:00
Satoshi Kataoka
db0aa747be
Merge "Purge WordsPriorityQueue"
2013-06-03 10:21:29 +00:00
Ken Wakasa
4caf594198
Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
...
Change-Id: I8779d397b0ebe2abbf7c3fbc1a79a1a0939c04f0
2013-06-03 19:14:02 +09:00
Satoshi Kataoka
04e37fb925
Purge WordsPriorityQueue
...
Change-Id: If14034c09d0dd335c84dd3a6ea2775655eefd38f
2013-06-03 19:04:37 +09:00
Satoshi Kataoka
cbb1ee485c
Fix build
...
Change-Id: I907150be994c4f9ffc030c063de521eeb177d3e1
2013-06-03 18:59:45 +09:00
Tadashi G. Takaoka
b4ae86f0de
Merge "Rename methods for readability"
2013-06-03 09:57:48 +00:00
Satoshi Kataoka
dceebee4b8
Purge UnigramDictionary
...
Bug: 8550444
Change-Id: I899f3bdce977c521515e548ca0c4ee6d29d6450b
2013-06-03 18:54:03 +09:00
Satoshi Kataoka
eb6a7c828b
Merge "Migrate used functions in UnigramDicitonary"
2013-06-03 09:46:59 +00:00
Satoshi Kataoka
6c4ad527dc
Migrate used functions in UnigramDicitonary
...
Bug: 8550444
Change-Id: Ic1ed2d85537cd47cf18a8373203f331abb7508f6
2013-06-03 18:28:50 +09:00
Tadashi G. Takaoka
2a529b85d0
Merge "Clear previous suggestions when gesture typing starts"
2013-06-03 09:27:55 +00:00
Tadashi G. Takaoka
9ff7354d78
Clear previous suggestions when gesture typing starts
...
Bug: 8651076
Change-Id: Ic65ed3e3696409edea4e35080c11e4d1869a5a7e
2013-06-03 17:59:26 +09:00
Tadashi G. Takaoka
2a9882a433
Rename methods for readability
...
Change-Id: I8fc2c90cf8d3dce11740f8e61edf6dfde9b1c116
2013-06-03 17:52:21 +09:00
Satoshi Kataoka
d858b5815f
Move obsolete files to obsolete dir 2
...
Bug: 8550444
Change-Id: Ia83796d696e04f51adb39867dfd21d1ac993b63c
2013-06-03 17:42:27 +09:00
Satoshi Kataoka
e0bbb98d60
Fix build
...
Change-Id: I2a876df097d59324aeb58eb83698ec622ac6191b
2013-06-03 17:23:25 +09:00
Satoshi Kataoka
01cae939a9
Move obsolete files to obsolete dir
...
Bug: 8550444
Change-Id: Ie65eea25da4c41e1128d1d8d8643fb6afe8f41e4
2013-06-03 17:07:59 +09:00
Jean Chalard
3b94fd7b97
Merge "Update dictionaries"
2013-06-03 07:58:39 +00:00
Satoshi Kataoka
7c92b421ee
Purge DicTraverseWrapper
...
bug: 8550444
Change-Id: Iad017e66ac579c6727b9f60ad9cda64e478200e5
2013-06-03 16:45:51 +09:00
Jean Chalard
e73802f335
Update dictionaries
...
>>> dictionaries/ru_wordlist.combined.gz
Header :
date : 1366974711 <=> 1370244430
MULTIPLE_WORDS_DEMOTION_RATE : 0 <=> 50
version : 32 <=> 34
Body :
Deleted: МДА 2
Freq changed: а 0 -> 60
Freq changed: в 0 -> 60
Deleted: возбужденные 0
Freq changed: гей 92 -> 0
Freq changed: жид 80 -> 0
Freq changed: зареган 0 -> 50
Freq changed: и 0 -> 60
Freq changed: к 0 -> 60
Deleted: клевом 0
Freq changed: куи 29 -> 0
Freq changed: лох 69 -> 0
Freq changed: о 0 -> 60
Freq changed: ребут 0 -> 50
Freq changed: с 0 -> 60
Freq changed: у 0 -> 60
Freq changed: хуй 77 -> 0
Freq changed: хукера 38 -> 0
Freq changed: широко 0 -> 144
Deleted: щеткой 70
Freq changed: щёткой 69 -> 70
Freq changed: я 0 -> 60
Added: жены 134
Added: звони 100
Added: клёвом 50
Added: мда 0
>>> java/res/raw/main_ru.dict
Header :
date : 1366974711 <=> 1370244430
version : 32 <=> 34
MULTIPLE_WORDS_DEMOTION_RATE : 0 <=> 50
Body :
(same changes)
Change-Id: Ie10bdd1f33cac43c5be35e99faef7cfdfe877d2b
2013-06-03 16:41:12 +09:00
Tadashi G. Takaoka
043273b00f
Expand suggestion strip when center suggestion is long
...
Bug: 9059710
Change-Id: I7fa2658cc6442e86f69c991f1e99db6fb1ef909c
2013-06-03 16:12:59 +09:00
Tadashi G. Takaoka
0e66ab7433
Merge "Fix ArrayIndexOutOfBoundException"
2013-06-03 07:12:07 +00:00
Tadashi G. Takaoka
72ac390ce6
Fix ArrayIndexOutOfBoundException
...
Change-Id: I243fc4965365680615eed834efe9ae0240e7f2a8
2013-06-03 15:35:49 +09:00
Kurt Partridge
c4119c8063
Merge "Uncommit an extra LogUnit"
2013-06-03 05:38:43 +00:00
Satoshi Kataoka
d18112046a
Move bigram_dictionary
...
Change-Id: I2c243ac75bc02b912f6b0fabedd372148adf8076
2013-06-03 14:13:39 +09: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
a2f3f17de6
Merge "Compare scrubbed strings when uncommitting LogUnits"
2013-06-03 03:03:58 +00:00
Kurt Partridge
743302888b
Merge "Uncommit separator LogUnits"
2013-06-03 03:01:23 +00:00
Kurt Partridge
3d20946272
Merge "Uncommit LogUnits when reverting textInput"
2013-06-03 02:58:20 +00:00
Kurt Partridge
4efb5c3b65
Merge "Remove uncommit on reverting batch input"
2013-06-03 02:54:33 +00: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
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
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
d3ccd4bf22
Merge "Import translations. DO NOT MERGE"
2013-05-31 23:19:22 +00: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
26f489493e
Fix the displayed status after download
...
Bug: 9166225
Change-Id: I7490593d88a5854b9e675b9ead89d2ea9b49315c
2013-05-31 20:28:15 +09: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
a0c3e02d71
Refactor SuggestionStripLayoutHelper a bit
...
Bug: 9059710
Change-Id: Ief12029bad75d4dc78090ab97555aece01b873de
2013-05-31 18:14:47 +09: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