Commit graph

1184 commits

Author SHA1 Message Date
Jean Chalard
c84f178cd9 Merge "Remove a useless method, rename another. (A54)" 2012-07-05 02:05:50 -07:00
Jean Chalard
792e7ddc24 Merge "Remove a redundant test (A53)" 2012-07-05 01:57:04 -07:00
Jean Chalard
9636735c0a Merge "Small simplification (A52)" 2012-07-05 01:56:55 -07:00
Jean Chalard
21524c755c Merge "Put some more code in common (A51)" 2012-07-05 01:50:44 -07:00
Jean Chalard
71d7fc91b7 Merge "Pull up a common variable into the wrapping method (A50)" 2012-07-05 01:47:59 -07:00
Jean Chalard
ac3ad6ef9f Merge "Factorize some common code (A49)" 2012-07-05 01:45:08 -07:00
Tadashi G. Takaoka
15d3532170 Merge "Fix tab key's navigation behavior" 2012-07-05 01:24:00 -07:00
Jean Chalard
3d8e7a62fc Remove a useless method, rename another. (A54)
Change-Id: If36b5375b04f68deeb72bcece3cb8d37aed57f59
2012-07-05 17:22:15 +09:00
Jean Chalard
0783366036 Remove a redundant test (A53)
Change-Id: If711074fdcb586e35d02e421c845f2c9024ca718
2012-07-05 17:22:04 +09:00
Jean Chalard
4cba560dbb Small simplification (A52)
Change-Id: I56bc5b9b584de5a14b41fc32c19f7fefb3b12e88
2012-07-05 17:22:00 +09:00
Jean Chalard
ea80794dd4 Put some more code in common (A51)
Change-Id: If1589e29728df20713c75e08df7f47f0de9202d4
2012-07-05 17:21:55 +09:00
Jean Chalard
cbfd2e1fdb Pull up a common variable into the wrapping method (A50)
Change-Id: I0b62098308169b5c44ced25ffb902766e3732fbf
2012-07-05 17:21:51 +09:00
Jean Chalard
7ed22f1f72 Factorize some common code (A49)
Also add some comment to clarify what's happening inside those
methods

Change-Id: I5b9b1e105b3145f0b050f35d12c5b6ca6e4a4d8c
2012-07-05 17:21:44 +09:00
Tadashi G. Takaoka
b28934adac Fix tab key's navigation behavior
Bug: 6435484
Change-Id: Iffe459c117ad438e96ec6f5c7e64fb80b32d227e
2012-07-05 16:57:14 +09:00
Jean Chalard
e47c728dd5 Add a wrapper to updateSuggestions / Predictions (A48)
The goal is to have those converge, as they contain almost 100%
duplicated code.

Change-Id: I6921791d47efce9fb396efd9626839d706664a91
2012-07-05 11:10:04 +09:00
Jean Chalard
7b40c68277 Refactoring which will help with future changes (A47)
Change-Id: Ibc2d28f9f95966f77d4d7bdf9ae4688baaed5989
2012-07-05 11:10:02 +09:00
Tadashi G. Takaoka
5c641a9f59 Remove WordComposer.add(int, int, int, KeyDetector) method
Change-Id: Ie6af46acba18a2d1cf3ddd1578d60ded4c90f89a
2012-07-04 17:29:47 +09:00
Jean Chalard
aba432bf8d Remove a duplicate method (A36)
Bug: 6705473
Change-Id: Ib6260034b09739b60071e90a018b2dc6be3815d7
2012-07-02 12:12:16 +09:00
Jean Chalard
0a63111821 Remove a useless parameter (A29)
Change-Id: I52625e707abf61da9b95e542f0814c66b532f483
2012-06-29 17:00:56 +09:00
Jean Chalard
f4267c0521 Fix a small bug (A27)
TypedWordValid and AllowsToBeAutoCorrected are almost the
same thing; the difference is whether the word is also a
whitelist entry or not. In this case, TypedWordValid was
the right one to test.

Change-Id: I695fe5b9f6bbe9d3ba314c646da3a25742c9f4ed
2012-06-29 17:00:56 +09:00
Jean Chalard
305326e789 Refactoring and add debug prints (A9)
Change-Id: I46497bff107f0def0dfa2b043b20d9a0b0cde040
2012-06-29 14:24:54 +09:00
Jean Chalard
b5afd3de0c Remove unused stuff.
Change-Id: Ifd0d5b6978f76b841574a6e10157c32d0cd656b6
2012-06-27 17:44:16 +09:00
Jean Chalard
05efe576f9 Cleanup the dictionary type.
Stop storing an int in each of the different class types, and
just store a string in the top class.

Change-Id: I2af1832743e6fe78e5c1364f6d9cc21252bf5831
2012-06-27 17:31:09 +09:00
Jean Chalard
28eeb35d14 Merge the interface of two methods that do the same thing (A9)
Change-Id: Ia5701d713d0fd5bb646b54a03a1a5602dad0a9e6
2012-06-26 16:55:09 +09:00
Satoshi Kataoka
2cf265b345 Merge "Fix possible NPE from a concurrent problem in LatinIME" 2012-06-21 22:16:48 -07:00
Jean Chalard
1b71ff00a2 Merge "Update an outdated comment" 2012-06-20 20:18:51 -07:00
Jean Chalard
e8bb8351d6 Cleanup, part 9 (C9)
Change-Id: Ifb15553824915d0634aea83689302c2418b093f3
2012-06-21 09:22:32 +09:00
Jean Chalard
ca6b7d5265 Cleanup, part 8 (C8)
Change-Id: Iecc9b3d43c191614c2951408e14085cb77eefd4d
2012-06-20 03:45:40 +09:00
Jean Chalard
2f3a694e29 Cleanup, part 7 (C7)
Change-Id: I662be9d3b31fb9e157722f38cab1e6fb8a1152ab
2012-06-20 03:17:33 +09:00
Jean Chalard
c03bd090ea Merge "Cleanup, part 4 (C4)" 2012-06-19 09:24:25 -07:00
Jean Chalard
bd765d3355 Merge "Cleanup, part 3 (C3)" 2012-06-19 09:24:00 -07:00
Satoshi Kataoka
67b9337b6c Fix possible NPE from a concurrent problem in LatinIME
Bug: 6620746
Change-Id: Icc18de92d7edc6888c712c2cf5ce479a65f8bfad
2012-06-19 03:34:45 +09:00
Jean Chalard
b0561ae980 Remove a member (B5)
The new call in the test ensures getCurrentInputEditorInfo actually
works.

Change-Id: I2ee407bd9927d22db537d12f339e2b977a38054a
2012-06-19 03:27:37 +09:00
Jean Chalard
fe53e5c060 Move a settings method to SettingsValues (B3)
Change-Id: Ibfa27bd919c92be219c4d107b3ace008ca80a19f
2012-06-19 02:52:36 +09:00
Kurt Partridge
6080f6878b Remove non-dictionary words and digit touch data.
Output to the ResearchLogger is now queued and only flushed if the word
the user was working on is a dictionary word.

multi-project commit with Ic713ec00777fbdcf4a937b3c77b995257e100fc7

Bug: 6188932
Change-Id: I9de15227ff51be23083d9096f1c1b3d83802fff7
2012-06-17 15:02:15 -07:00
Jean Chalard
9b233ecef2 Cleanup, part 4 (C4)
Change-Id: I2821ae71ec49e4b6b512157d17b80198f74321e4
2012-06-16 10:51:04 +09:00
Jean Chalard
5475e92b3f Cleanup, part 3 (C3)
Change-Id: Ib0be8dc26b6fa366a3dabeea940d466602073244
2012-06-16 10:46:18 +09:00
Jean Chalard
4a5cb5c36a Update an outdated comment
Change-Id: I3d02dc8597ed14d998caeaa056813353e2d7ec1a
2012-06-16 10:34:57 +09:00
Jean Chalard
dca729fddd Move final attributes to SettingsValues (B2)
Bug: 6675475
Bug: 6677394
Change-Id: I4a26efb9226d3f909f331c4d2e47cd83a05c011e
2012-06-16 08:01:09 +09:00
Jean Chalard
3d44f489b3 Inline a method for simplicity (B1)
This has a confusing name and is a one-liner

Change-Id: I954a648a8413e38a535c2b81e4b171e1bdc9f1c2
2012-06-16 03:18:00 +09:00
Jean Chalard
a19c5e6380 resolved conflicts for merge of be82f297 to master
Change-Id: If49ca384ea0ac415a75f8ea1bad77dc6719cb04d
2012-06-15 09:03:52 +09:00
Jean Chalard
7cbd0478cf Merge "Do not display punctuation suggestions when bigrams are on." into jb-dev 2012-06-14 14:37:13 -07:00
Jean Chalard
d5b765b3bb Do not display punctuation suggestions when bigrams are on.
Bug: 6310401
Change-Id: I9d31c48e287aceedaf2f4c5129031ddb31402451
2012-06-15 06:01:09 +09:00
Jean Chalard
78573f2e8a Fix an NPE
This code is temporary until we get rid of this member.

Bug: 6662963
Bug: 6667091
Change-Id: I1d970d2a97992507e86c5b94978a2543fe42b375
2012-06-15 05:47:35 +09:00
Satoshi Kataoka
d2f210dbe2 am d9c702d2: am 5caaf1b9: Merge "Do not add profanity to user history bigram dicitonary" into jb-dev
* commit 'd9c702d2ff017452f0264f2be12b6bffd6204e4a':
  Do not add profanity to user history bigram dicitonary
2012-06-14 10:33:47 -07:00
Satoshi Kataoka
68c650fb2a Do not add profanity to user history bigram dicitonary
Change-Id: I864c4206e3e6cde4d6ed687a9759e98901e16b9a
2012-06-14 15:15:08 +09:00
Jean Chalard
9d71748ba4 Fix an occurrence of nested batch edits.
This is harmless, but against policy.
Also, rework the checking code to be more readable, give more
information, and be called for all relevant methods - and not
for informative methods, which are not required to be in a
batch edit.

Change-Id: I03fa8b2e7d68a6a133f86be8a214671750c29256
2012-06-13 07:02:07 +09:00
Jean Chalard
c7564a787e Optimization
This is much faster. It doesn't create messages, it doesn't post
stuff in a queue, it doesn't delay execution of other messages.
Also, it decouples the timer from the functionality of the Handler
so this can be pulled up in another change to consolidate with
mLastKeyTime or so.

Change-Id: I9044fc031373e66b9b40eee8025633613d0945dc
2012-06-13 07:02:07 +09:00
Jean Chalard
72b358aa90 Small optimization.
This will avoid some two-way IPC calls.

Change-Id: If9eb3e99b3d08346aadd4bbed2a1761f8c2527b9
2012-06-13 07:02:07 +09:00
Jean Chalard
e86054e5c2 Consolidate a test.
Stop using the numerical value, use the actual method

Change-Id: Iffa7f2d21a0471c7862afd3234cc9c5dd86feb2e
2012-06-13 03:34:58 +09:00
Jean Chalard
140adf204b Consolidate auto-correction settings.
For some reason, there were several ways, not exactly identical,
to get this setting. The ones that used mAutoCorrectionEnabled
would kick in when the input field was specifying no correction,
so it would be a little strange (although harmless in the practice
because the settings set in this way would not get used later,
because the correct test would be done at that time).

Also perform a very small refactoring

Change-Id: Ica9f32b238d98009ae1852d3c1e940398f5d341c
2012-06-12 10:29:55 +09:00
Jean Chalard
2010aad741 Move two methods in a more appropriate place
Change-Id: I512b04e23490413a44b1ca0517102fe2d9138df3
2012-06-12 10:29:55 +09:00
Jean Chalard
a32eb27213 Move an editing method to the RichInputConnection
Change-Id: Ie143ad008ca8deb1c5034cb80ec1cb28a6b0682d
2012-06-12 10:29:55 +09:00
Jean Chalard
243e370fcb Move a member call out of the way
Change-Id: I5da48442c0b39aaff817c3b6d067a9b13fda0643
2012-06-12 10:29:55 +09:00
Jean Chalard
747cf0435a Move two editing utility methods to RichInputConnection
Change-Id: If8d03bea1b6369cb3043da6321048d052995d664
2012-06-12 10:29:55 +09:00
Jean Chalard
297e6d590b Rename mSettingsValues to mCurrentSettings
...for readability. After all, it makes sense that "current settings"
is a "SettingsValues", while it's harder to understand why we'd
manipulate an object named "SettingsValues".

Change-Id: Ide9a17b970a6cc00b80b9a217f986268c739c662
2012-06-08 21:34:07 +09:00
Jean Chalard
d273697259 Move suggestion strip visibility to SettingsValues
Change-Id: If34112c69acd5122d87554043d87d8f4dbdf5d15
2012-06-08 21:26:25 +09:00
Jean Chalard
01e3b014bb Accept a null input attributes for reading settings.
Change-Id: I11a8e1aca3541c35d2b39b27716687fcd8ff3dc6
2012-06-08 21:15:33 +09:00
Jean Chalard
4b9e6ee6fb Move the correction mode to SettingsValue and make it final
At last this guy is final, at last

Change-Id: I76911f8d47493f8a1719f75fc7e949be5d7da1a2
2012-06-08 21:10:35 +09:00
Jean Chalard
3791183076 Consolidate updateCorrectionMode() calls
Change-Id: I43c0505e9a1652bfc568f23b787fc68a5c5e9220
2012-06-08 21:02:19 +09:00
Jean Chalard
bbbdab12be Move some editing methods to RichInputConnection.
Change-Id: I8527776a4bd8236a85bb77f9791f9b76977ad181
2012-06-08 20:23:13 +09:00
Jean Chalard
e091982868 Straighten batch edits, pass 1
Change-Id: I73acfee9098a87b9cde8aca720586ec748b2a82f
2012-06-08 20:09:41 +09:00
Jean Chalard
02308bec63 Merge RichInputConnection with EditingUtils
Change-Id: I9982ff325bef56694402caef28a77683c52ccd71
2012-06-08 20:04:09 +09:00
Jean Chalard
5475b38328 Make a wrapper for the input connection.
The goal is to simplify the code in LatinIME.java as well as having
a handy place to put debug calls to see interaction with TextView.

Change-Id: I255227e7e7343e0c2f3dcd1f185e5020d6186732
2012-06-08 19:50:12 +09:00
Jean Chalard
67fd0c240d Remove deprecated classes.
Should we maybe rename back *BinaryDict* to *Dict* in another
change for simplicity?

Change-Id: I8f7dcb78b9bdf1a13ce403a997fbb8619f2b453b
2012-06-08 17:12:15 +09:00
Jean Chalard
7214617622 Remove a slew of Eclipse warnings.
Change-Id: I03236386aea13fbd4fb8eaeee18e0008aa136502
2012-06-08 16:23:18 +09:00
Ken Wakasa
d418580a71 Fix typo
Change-Id: I264f829c1584a37995dbc5ee4ba6b6783d5d4834
2012-06-08 03:42:02 +09:00
Tom Ouyang
11dc22d964 Merge "Contacts binary dictionary updates with change in keyboard locale." 2012-06-07 01:19:44 -07:00
Tom Ouyang
2e8aa06002 Contacts binary dictionary updates with change in keyboard locale.
Bug: 6616436
Change-Id: I8d66a37f295134c5b9875b2a305a9be7442bd75d
2012-06-07 00:25:41 -07:00
Kurt Partridge
9b300f0caa Merge "add research log ui control" 2012-06-06 20:47:53 -07:00
Kurt Partridge
724bc479f7 add research log ui control
- lets users flag a particular time in the research log
- lets users delete the log for this session

also makes the UsabilityLog setting control whether the ResearchLog logs or not.

multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe

Bug: 6188932
Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399
2012-06-06 20:42:01 -07:00
Satoshi Kataoka
91c8c4f3a7 am e08cfda1: am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each language" into jb-dev
* commit 'e08cfda1ebea693c56681816076c419f23c51076':
  Cache UserHistoryDictionary for each language
2012-06-06 10:48:46 -07:00
Satoshi Kataoka
5a8d2fd1d3 Merge "Cache UserHistoryDictionary for each language" into jb-dev 2012-06-06 10:43:50 -07:00
Satoshi Kataoka
a836808f8b Cache UserHistoryDictionary for each language
Bug: 6603257
Change-Id: I73b65e921cff8337a00594525f67f6aec2178881
2012-06-06 20:02:00 +09:00
Tadashi G. Takaoka
876711930d am 2eb5eb4d: am be2fef4d: Merge "Fix backing view height calculation in landscape orientation" into jb-dev
* commit '2eb5eb4d447cb326b4c10cff2cae64df4e431ffd':
  Fix backing view height calculation in landscape orientation
2012-06-05 17:58:59 -07:00
Tadashi G. Takaoka
b94f4cc71c Fix backing view height calculation in landscape orientation
This logic has been dropped by Ib814c07f.

Bug: 6610497
Change-Id: Id89ad3280b73a31d8c9c6826e9ee297791624db1
2012-06-05 17:41:01 -07:00
Tadashi G. Takaoka
9895b815a8 am e2832daf: am 8cf3654a: Merge "Use calculated backing view height instead of the view\'s height" into jb-dev
* commit 'e2832daf4c289f94d68c546c485fc06bbf6aefd6':
  Use calculated backing view height instead of the view's height
2012-06-03 21:55:26 -07:00
Tadashi G. Takaoka
bc5b89cdff Use calculated backing view height instead of the view's height
This change removes the work around that was introduced by If4f24500.

Bug: 6596131
Change-Id: Ib814c07fdac7d0aa0d7fbc2764fda1af42b82ad5
2012-06-04 12:49:27 +09:00
satok
083fb024d7 am e6560252: am 72cd8466: Merge "Fix NPE in user history bigram dictionary" into jb-dev
* commit 'e656025282c0da28ed80b2604949092dbc5fb72e':
  Fix NPE in user history bigram dictionary
2012-05-31 20:29:43 -07:00
satok
4f96bb4520 Fix NPE in user history bigram dictionary
Bug: 6584882
Change-Id: Id0162bffc4f0f36239cdc68383f8a47d7a957397
2012-06-01 12:19:22 +09:00
Satoshi Kataoka
c5d4362b59 am 408fa1ac: am 961e676b: Merge "Set level 1 as the initial value of the valid words" into jb-dev
* commit '408fa1ac48a3eb6f378274d5dd0e490da0f453ae':
  Set level 1 as the initial value of the valid words
2012-05-29 04:49:33 -07:00
Satoshi Kataoka
c88f61215c Set level 1 as the initial value of the valid words
Bug: 4192129
Change-Id: I867e78ce79c78977d08e8b66881a25b6fe5bf41f
2012-05-29 20:39:39 +09:00
satok
1c69942683 am fff5cd6f: am aa064139: Merge "Forget user history" into jb-dev
* commit 'fff5cd6f767e248ecb5b30ea39cb9a22a476b953':
  Forget user history
2012-05-27 23:03:46 -07:00
satok
aa0641394b Merge "Forget user history" into jb-dev 2012-05-27 22:59:22 -07:00
satok
fd53b8cc2b Forget user history
Bug: 4192129

Change-Id: Ic98398e5383093a1c24373849eadc48fc4d3626f
2012-05-28 14:34:02 +09:00
Jean Chalard
1a31b4e484 am fac23787: am bed613cf: Merge "Simulate hardware enter/delete events if the app targets < 16" into jb-dev
* commit 'fac23787bbd7723acba4e7e344aa6f799d9584f6':
  Simulate hardware enter/delete events if the app targets < 16
2012-05-27 21:26:06 -07:00
Jean Chalard
4e1a558ee8 Simulate hardware enter/delete events if the app targets < 16
This will make text input buggy on all apps until they target
JB or superior.

Bug: 6537051
Change-Id: I726347db8c84d1582ad1962d3a910e698389e08c
2012-05-28 12:00:43 +09:00
Jean Chalard
f27ac2733c am d45e334f: am 7707e045: Merge "Cache application info." into jb-dev
* commit 'd45e334f5a73d2cc36800a81e1bbf881e633f026':
  Cache application info.
2012-05-25 04:11:15 -07:00
Jean Chalard
64766fbcaa am 6691bd67: am 9b93817b: Merge "Get information about the target application." into jb-dev
* commit '6691bd675a555163aa59c2ac791c6138c1d8a32c':
  Get information about the target application.
2012-05-25 03:34:46 -07:00
Jean Chalard
1b1243d61f Cache application info.
Bug: 6537051
Change-Id: Ieca891235df0d697bdeb0510651b703654fdef38
2012-05-25 18:54:53 +09:00
Jean Chalard
b224b60c94 Get information about the target application.
Bug: 6537051
Change-Id: I9fe7a07b5ddf2a423d5764840753ea70544206f1
2012-05-25 18:41:32 +09:00
satok
6d6c070eba am 925212ff: am c54d558e: Cancel adding user history bigram when autocorrection is cancelled
* commit '925212ff4b3d6ff4182a94a133c0e4a4f23dd6aa':
  Cancel adding user history bigram when autocorrection is cancelled
2012-05-23 20:19:46 -07:00
satok
c54d558e2e Cancel adding user history bigram when autocorrection is cancelled
Bug: 6465474
Change-Id: Ifbfe0ddc2ce5fab070939ede3db7bf03a8535a45
2012-05-24 12:11:02 +09:00
Jean Chalard
008b528cbd am c4f66d32: am 6c034901: Fix an NPE
* commit 'c4f66d3233159ee224dd0b30dd117fe539af2be6':
  Fix an NPE
2012-05-22 20:18:01 -07:00
Jean Chalard
6c0349012e Fix an NPE
Bug: 6538761
Change-Id: Id85486ee93437cfec7db421d5c7f2d7980a7e32e
2012-05-23 12:05:36 +09:00
Kurt Partridge
8ccc875754 Merge "switch ResearchLogger output to json." 2012-05-22 10:32:23 -07:00
Jean Chalard
906857430b am 37105e86: am 09c4909c: Merge "Remove a high surrogate after a delete if any" into jb-dev
* commit '37105e8636fc84f9e903581443730a0bf6692996':
  Remove a high surrogate after a delete if any
2012-05-22 03:38:05 -07:00
Jean Chalard
978c96aa99 Remove a high surrogate after a delete if any
Bug: 6526328
Change-Id: Iae70cad7b3c114bc13af48ae0eadd52ab88e8471
2012-05-22 19:04:31 +09:00
Kurt Partridge
07cd1e1731 switch ResearchLogger output to json.
use multiple logging files, clean up internal nested class structure.

multi-project commit with I1813b6710ef586d96cf8936662f58b870040d6e5

Bug: 6188932
Change-Id: I438790e28f74747c4c1a48a20c1942a0fd818b6c
2012-05-21 18:45:21 -07:00
Tadashi G. Takaoka
d4577f738b am 82ffc9fe: am 16950d65: Reset automatic upper case when chroding key is pressed
* commit '82ffc9fe5f7255c902e371bb5353bdef97205fd6':
  Reset automatic upper case when chroding key is pressed
2012-05-21 14:29:59 -07:00
Tadashi G. Takaoka
865df41ba8 am 647827cc: am 78e3977e: Get rid of unused CODE_HAPTIC_AND_AUDIO_FEEDBACK
* commit '647827cc0171f7dc5d425dea5754fca3df49d036':
  Get rid of unused CODE_HAPTIC_AND_AUDIO_FEEDBACK
2012-05-21 14:29:25 -07:00
Tom Ouyang
cfec078d8b am 4bdb2bf3: am e1128687: Merge "Change to a binary version of the expandable user dictionary." into jb-dev
* commit '4bdb2bf3b9cceb99736a736de42088fcf3bd1a0f':
  Change to a binary version of the expandable user dictionary.
2012-05-21 14:10:54 -07:00
Tadashi G. Takaoka
6fbb8c8fc3 am 628a5745: am 75c60bf3: Merge "Change auto caps mode argument to int type" into jb-dev
* commit '628a5745e19d227cdff2370704a4958e2791eb5a':
  Change auto caps mode argument to int type
2012-05-21 14:10:50 -07:00
Jean Chalard
45befb946f am 9ad774d1: am 91492993: Merge "Close batch edit" into jb-dev
* commit '9ad774d1f68bf3d2a4c38e5b4c3a2fa03e371eff':
  Close batch edit
2012-05-21 12:44:10 -07:00
Jean Chalard
8717ad4cbd am 79daef2e: am 71b047e3: Merge "Don\'t deactivate the LastComposedWord on shift" into jb-dev
* commit '79daef2e9b29b67048cd052b33c88675a0c62220':
  Don't deactivate the LastComposedWord on shift
2012-05-21 11:52:11 -07:00
Tadashi G. Takaoka
16950d65c3 Reset automatic upper case when chroding key is pressed
Bug: 6501446
Change-Id: Idc3b88b5370c0d7968cc388885e9066f922cfcf3
2012-05-21 19:24:43 +09:00
Tadashi G. Takaoka
78e3977e90 Get rid of unused CODE_HAPTIC_AND_AUDIO_FEEDBACK
Bug: 6523953
Change-Id: Ibea6c74d00e956116f492a3bedfe40e580b4c316
2012-05-21 12:24:17 +09:00
Tom Ouyang
e1128687b1 Merge "Change to a binary version of the expandable user dictionary." into jb-dev 2012-05-18 10:05:11 -07:00
Tadashi G. Takaoka
553e2f19c1 Change auto caps mode argument to int type
Bug: 6501446
Change-Id: I3f7bc0fc39edd29ebf96107c3d43b9ccc9b8022e
2012-05-18 17:46:05 +09:00
Jean Chalard
d4cacb1e41 Close batch edit
This does the same thing as Ie30e1aff but differently

Bug: 6512086
Change-Id: I47ae990510d3f657abd45ad5f0e325d93dec83c0
2012-05-18 12:07:58 +09:00
Tom Ouyang
f6adff6227 Change to a binary version of the expandable user dictionary.
Bug: 6435677
Change-Id: If83409f699608d443796e64a3c65692ae81b98e6
2012-05-17 15:12:00 -07:00
Jean Chalard
125de3dfdf Don't deactivate the LastComposedWord on shift
Bug: 6495116
Change-Id: Ib86de02a1216146082bf58a033982ac37fefffe1
2012-05-17 17:05:30 +09:00
Jean Chalard
848081ad8b am 8dced70b: Merge "Read and use user dictionary shortcuts." into jb-dev
* commit '8dced70b062744a2c27e0cf6dcd0787cf598a97c':
  Read and use user dictionary shortcuts.
2012-05-15 11:37:54 -07:00
satok
d9c4aa83e1 am 76218b96: Merge "Do not set "SuggestionSpan"s for suggestions from the next word predicition" into jb-dev
* commit '76218b966a6a712f3baa72d95c6d125d414cdbd4':
  Do not set "SuggestionSpan"s for suggestions from the next word predicition
2012-05-15 11:37:52 -07:00
Kurt Partridge
0320c526c2 Merge "include text context in researchLogger" 2012-05-15 10:17:59 -07:00
Jean Chalard
8dced70b06 Merge "Read and use user dictionary shortcuts." into jb-dev 2012-05-14 20:38:23 -07:00
Jean Chalard
19ad9bf145 Read and use user dictionary shortcuts.
Bug: 4646172

Change-Id: I51002c73d5bad1a698110c5cda02253348be8eed
2012-05-15 12:23:43 +09:00
satok
0142b997bf Do not set "SuggestionSpan"s for suggestions from the next word predicition
Bug: 6294817
Change-Id: I5010eafa5ba7e947743706adf7e722f4f0cfb415
2012-05-15 12:08:31 +09:00
Kurt Partridge
aec44d50a7 include text context in researchLogger
when logging LatinIME.onUpdateSelection(), now include the current word and
preceding word.  no escaping of the word is performed; this is temporary
until the output format is cleaned up.

also fix EditingUtils.getWordRangeAtCursor to support supplementary
UTF-16 characters.

Bug: 6188932
Change-Id: If4612a2627537d5d8bb2f9585a3ad1b4e56c2e26
2012-05-14 09:55:26 -07:00
satok
9978953e29 am 6792a909: Merge "Output caps debug code" into jb-dev
* commit '6792a909cd0da3db6a957cb2576b4d08f46a53b7':
  Output caps debug code
2012-05-11 03:33:42 -07:00
satok
b6fb5eb391 Output caps debug code
Change-Id: I4a3399d9066bd28dab893ecebb720924110b871d
2012-05-11 17:37:14 +09:00
Tadashi G. Takaoka
46b26ed892 am c8bde75c: Merge "Optimize InputConnection.getCursorCapsMode calling" into jb-dev
* commit 'c8bde75cf455c02efc57c2e35bbe446b83c23739':
  Optimize InputConnection.getCursorCapsMode calling
2012-05-09 01:55:45 -07:00
Jean Chalard
9648b1674e am d5cd7e64: Small optimization
* commit 'd5cd7e64aa30096241f63e47a9169699bdd98231':
  Small optimization
2012-05-09 01:55:44 -07:00
Jean Chalard
4e02b1273b am 442ac5d0: Merge "Don\'t ask for surrounding characters for each keypress" into jb-dev
* commit '442ac5d0bb96ec257d26b28df2fabefdefe59b96':
  Don't ask for surrounding characters for each keypress
2012-05-09 01:55:43 -07:00
Tadashi G. Takaoka
3b0f0b57ff am f52aef84: Merge "Tab key preforms next action when EditorInfo.IME_ACTION_NEXT is specified" into jb-dev
* commit 'f52aef84a582197d6f8e580044b2d24d2a710cef':
  Tab key preforms next action when EditorInfo.IME_ACTION_NEXT is specified
2012-05-09 01:55:41 -07:00
Tadashi G. Takaoka
c8bde75cf4 Merge "Optimize InputConnection.getCursorCapsMode calling" into jb-dev 2012-05-09 00:24:00 -07:00
Tadashi G. Takaoka
03ca17c841 Optimize InputConnection.getCursorCapsMode calling
Bug: 6464226
Change-Id: I30c1b01be5e1719ded5f7f8a7e24a38e9bbc3637
2012-05-09 16:19:08 +09:00
Jean Chalard
d5cd7e64aa Small optimization
Change-Id: I067249976e557b60b606d2153deaeb3c8f1f38ac
2012-05-09 16:14:25 +09:00
Jean Chalard
736b109e16 Don't ask for surrounding characters for each keypress
Bug: 6464226
Change-Id: I03745bbcc21e5ec6ca57fa1257bf21c0cd26391a
2012-05-09 15:19:35 +09:00
Tadashi G. Takaoka
0b831ba2aa Tab key preforms next action when EditorInfo.IME_ACTION_NEXT is specified
Bug: 6435484
Change-Id: Iccca7d1b770c547efae0b5e5931cebd910083d40
2012-05-08 13:20:39 +09:00
Kurt Partridge
5a937aae99 Merge "record full text after finishing session" 2012-05-04 21:09:22 -07:00
Kurt Partridge
d67a248de4 record full text after finishing session
uses onWindowHidden() callback as proxy for finishing session.

Bug: 6188932
Change-Id: Ic63b47c946ca91fc35f80d71b2f9e24e2d0339ac
2012-05-04 10:57:50 -07:00
satok
9ec06c17d4 Fix build breakage
Change-Id: I22305137b336c9aab019d044a517ae8bc5fefe45
2012-05-02 18:14:40 +09:00
satok
57007ed582 Merge "Workaround return preserved backing view height when the backing view is not ready" into jb-dev 2012-05-02 01:42:00 -07:00
satok
f4cf5b9952 Workaround return preserved backing view height when the backing view is not ready
Change-Id: If4f24500ead516c46e6a93a95291e0897548c2f0
2012-05-02 17:40:10 +09:00
Tadashi G. Takaoka
ae2388c7f7 Fix checking if subtype belongs to this ime
Bug: 6422318
Change-Id: I5779c0e277444315191fa964a976dcb4316cc24a
2012-05-01 20:21:10 +09:00
Jean Chalard
551612dd9e Fix a bug where two spaces would be added instead of one
Bug: 6378291
Change-Id: Id2453333ae16146f816faf0eb68baa8ea1dd106a
2012-04-23 18:15:51 +09:00
Jean Chalard
96fb3094aa Fix a bug where a batch edit would not be started.
This would end up in TextView sometimes calling onUpdateSelection
multiple times (this is the correct behavior for TextView). We now
commit the space and the word in a batch edit, and we only get
onUpdateSelection once.

Bug: 6300527
Change-Id: I9579f3d8f5320c1cc24a7a42f19db8e105eb090d
2012-04-23 17:45:50 +09:00
Jean Chalard
29a1fc0f6b Don't allow cancelling manual pick.
Bug: 6347202
Change-Id: I30b53256e83c534436b0f0ff594fd4aaabf4558c
2012-04-20 15:55:45 +09:00
Kurt Partridge
48a7681e06 researchLogger detail on IME sessions
log device type, screen size, etc.  also simplification inside ResearchLogger
to use exceptions better, and fix ResearchLoggerTests to not change
preferences to specify the logfile.

multi-project change with Idfd193b16260215cca32886e288f03a0c12b2781

Bug: 6188932
Change-Id: Idd3ca6eb8e8e3934f68234b241c7fd7d0cc3bcd5
2012-04-19 20:19:55 -07:00
Tadashi G. Takaoka
6a7019ff5d Move main dictionary availability check to LatinIME
Change-Id: Ib6183fec833d87bc32514b03bb691fec0a1e6ff8
2012-04-19 23:23:26 +09:00
Tadashi G. Takaoka
65e93e352f Fix SubtypeSwitcher to honor subtype
Bug: 6364170
Change-Id: I31f9a7c9b6b4ca04a1c78a4210dcaae0db9825db
2012-04-19 22:42:14 +09:00
Tadashi G. Takaoka
1cb08acaf3 Add Constants class to hold public constants
This change also gets rid of compiler warnings about "deprecations".

Change-Id: Id9b83483c453a81ebac34b684656db05e3599657
2012-04-19 19:45:19 +09:00
Tadashi G. Takaoka
344af15674 Change predefined additional subtype format in preference
This change also refactor StringUtils class

Change-Id: Ie0b4d169b21c260bf238d6fcc9ab0ee8bfd6b508
2012-04-19 17:11:21 +09:00
Tadashi G. Takaoka
f5a0bd2c28 Make predefined subtype configurable by XML resource
Change-Id: I1f8486a1fb652f1e06789e7bfd2cc57273092234
2012-04-18 22:45:26 +09:00
Tadashi G. Takaoka
55d28fd1b2 Cleanup InputMethodManagerCompatWrapper
Change-Id: Id3b84ee19bb504ed8fbb398e260cc663a5b5ae0d
2012-04-18 18:01:29 +09:00
Tadashi G. Takaoka
a58ebc73ae Fix typo of some methods' name
Also changes some methods' argument type from Locale to String.

Change-Id: Ib68b528a450dc68a01546483403230f76500bee4
2012-04-18 16:40:50 +09:00
Kurt Partridge
d442984e96 researchLogging for inputConnection events
Bug: 6188932
Change-Id: I596df68956abd879293cfb550e66e7d7d0ba74e9
2012-04-17 20:05:10 -07:00
Tadashi G. Takaoka
79e07e3f84 Remove useless key event handling methods
Change-Id: I8c42fba79aba643ab7a145e6fd54ef23855a3ad0
2012-04-18 11:55:11 +09:00
Tadashi G. Takaoka
69bcc15cb3 Add SubtypeUtils.setAditionalInputMethodSubtypes method
Change-Id: Ia3043346ed87297e01d505980555fdf29ce4f96f
2012-04-17 22:48:00 +09:00
Kurt Partridge
9bfb620215 add logPoint for manual correction (inc touch pos)
Bug: 6188932
Change-Id: Ibcc4901bcfab6632ee4c59cb58d35452218a288d
2012-04-16 16:52:25 -07:00
Tom Ouyang
a7352c8df4 Merge "Add a new binary contacts dictionary based on ExpandableBinaryDictionary and use locale for bigrams." 2012-04-13 18:30:19 -07:00
Tom Ouyang
18222f8c86 Add a new binary contacts dictionary based on ExpandableBinaryDictionary and use locale for bigrams.
Bug: 6188977
Change-Id: I753422eed1effaeb5fd01124cf1ddd1e31ee9d60
2012-04-13 17:54:39 -07:00
Kurt Partridge
2783c51e6d Merge "clean up researchLogging of autocorrection" 2012-04-13 10:47:19 -07:00
Tadashi G. Takaoka
c206d04623 Use InputMethodSettingsFragment for IME settings
Change-Id: Id6d9cd0ddf99c0687b6d3ea4b2f868f6cf2a0eaf
2012-04-13 19:56:47 +09:00
Tadashi G. Takaoka
f6972561fc Utilize InputMethodSubtype and additional subtype
* Remove de_QY and fr_CH from supported subtypes
* Add de-qwerty and fr-qwertz predefined additional subtypes instead.

Change-Id: I49e8ba0299529302f2b91b4d018b07304cdd6897
2012-04-13 18:36:26 +09:00
Kurt Partridge
60adb87574 clean up researchLogging of autocorrection
remove dependence of ResearchLogger on LatinImeLogger
for autocorrection

multi-project commit with I32cc134b

Bug: 6188932
Change-Id: Iaeda97eb43fa4782db2d1b2a6d8d09a93b395111
2012-04-12 22:59:21 -07:00
satok
cf6b2099be Add isDictionaryAvailable to SubtypeSwitcher
Change-Id: I534878d330b57bbfaa8b7711082456969771f4dc
2012-04-12 19:46:02 +09:00
Jean Chalard
e6269759d6 Read the dictionary resource in a more sensical place.
We don't need to pass this down all the way from LatinIME any more.
It fetched be done exactly where it needs to be.

Change-Id: I9f277f9c4f9de70ae755a1334d86c67bbb24c988
2012-04-11 21:03:21 +09:00
Tadashi G. Takaoka
78ab80844b Add language suffix to main dictionary
Bug: 6319377
Change-Id: Ie6a887fefa12e33c17bfeb5d22984e7c1a7bdb46
2012-04-11 16:11:34 +09:00
Kurt Partridge
9bc29d78a6 add more data collection points to ResearchLogger (attempt #2)
the new points are all at Log.x() positions; only those appearing directly
related to user input were added.

multi-project change with I159f5de2

this CL is the same as I618bcd07, which was reverted because of
incompatibilities with vendor branches.

Bug: 6188932
Change-Id: I999249dceb0c04f5a4ffbfff25caed09d24a2c52
2012-04-09 09:38:07 -07:00
Kurt Partridge
d16bda4a4a Revert "add more data collection points to ResearchLogger"
This reverts commit ac9e87c03e
2012-04-06 18:26:34 -07:00
Kurt Partridge
ac9e87c03e add more data collection points to ResearchLogger
the new points are all at Log.x() positions; only those appearing directly
related to user input were added.

Bug: 6188932
Change-Id: I618bcd07b22c9efc794745678b073afe1e79a697
2012-04-06 09:35:13 -07:00
Tadashi G. Takaoka
11d9ee742f Use keyboardSet extra value of subtype to specify layout type
Change-Id: Ice1f345a08a8d760e3b847c885c4072e3e142c97
2012-04-05 17:25:15 +09:00
Tadashi G. Takaoka
cb389ef0d6 Refactor to utilize InputMethodSubtype
Change-Id: I76fbc8a395eb8dab996c02c86d7328f07865f8cf
2012-04-05 12:27:27 +09:00
Tadashi G. Takaoka
d2c5533fd9 Merge "Add RunInLocale class to guard locale switching" 2012-04-03 01:53:05 -07:00
Tadashi G. Takaoka
16c6f35570 Add RunInLocale class to guard locale switching
Bug: 6128216
Change-Id: I8d9c75c773c3de886183b291ada7a3836295839b
2012-04-03 17:43:45 +09:00
Tadashi G. Takaoka
8f433a66b2 Fix typo
Follow up for I5b9964f2
Bug: 6129704

Change-Id: Ia90c013cf4c4e6f675da5701644bd10833898c3f
2012-04-03 17:27:51 +09:00
Tadashi G. Takaoka
0d1a5d5b97 Cleanup EditorInfoCompatUtils
Bug: 6129704
Change-Id: I5b9964f2ad52e7cd60c63acca93d0241a1e729ef
2012-04-03 16:45:36 +09:00
Tadashi G. Takaoka
13d6ecc4c2 Remove InputMethodServiceCompatWrapper
Bug: 6129704
Change-Id: I76f2854e27623be940a711d0d48fd3f90132141c
2012-04-03 16:02:09 +09:00
Tadashi G. Takaoka
9cc2c94c8b Remove InputMethodSubtypeCompatWrapper
Bug: 6129704
Change-Id: I8f84f0f61a2205ac1fcd1cd40e3a586ee535282d
2012-04-03 15:31:26 +09:00
satok
7e518d8b83 Combine candidate words and scores
Bug: 5240798
Change-Id: Ie56c1c2cfd7f365e771fee88c1ed15012448feed
2012-04-02 18:39:24 +09:00
Ken Wakasa
96fdc4dd84 Remove InputConnectionCompatUtils
Also, small cleanup in proguard.flags

bug: 6129704
Change-Id: If4cc694dbe74b26b1d0da301bbc321ee7afc0211
2012-03-31 19:04:38 +09:00
Ken Wakasa
911b8f9d19 Remove the "deprecated" classes
bug: 6129704
Change-Id: Ib27f2774444e1f084b19be3fe6f56d25dffa7084
2012-03-30 16:20:56 +09:00
Kurt Partridge
347fcab043 improve ResearchLogger performance
also demonstrate proposed logpoint invocation

Bug: 6188932
Change-Id: Ib6a7a196fe2e5f8184d26d1e0e3e91b404454112
2012-03-29 15:37:41 -07:00
Tadashi G. Takaoka
20b4c223b4 Merge "Fix some obvious compiler warnings" 2012-03-29 00:18:36 -07:00
Tadashi G. Takaoka
8dcad2ed47 Don't send touch coordinates if proximity characters correction is disabled
Bug: 6225317
Change-Id: I4fa65e020d838f53066d4a071f58fb6f40583e0b
2012-03-29 16:11:54 +09:00
Tadashi G. Takaoka
c61cd79229 Fix some obvious compiler warnings
Change-Id: I10a634f7492b45d5a72345f14d36cf341946387d
2012-03-29 15:07:53 +09:00
Tadashi G. Takaoka
e07db71d26 Remove SupportTouchPositionCorrection from subtype extra value
Change-Id: Ieedff9ec212f5567405ca276b0f2194132ba7b0c
2012-03-28 19:45:28 +09:00
Ken Wakasa
c166697e3f Optimization: Start making use of ProductionFlag.IS_EXPERIMENTAL for ResearchLogger
Move GodMode specific tests to relevant directories as well.

This goes along with I9dc4d469

Change-Id: I4a21c53846b26eede346cb1da13e6abbdf9ec27f
2012-03-27 11:55:23 +09:00
Jean Chalard
a77bbc64f0 Merge "Correct a shaky processing and move it to a better place" 2012-03-25 17:57:49 -07:00
Kurt Partridge
d05afa3f4c move usability log code to new class (ResearchLogger) and clean api
This change also undoes the effects of I8694eb9016, which was an initial
effort built on Utils.UsabilityStudyLogs.  Now Utils operates as it did
previously, for backward compatibility, but the ResearchLogger retains
the new log format.

Coordinated with  I274b75c5.

Bug: 6188932
Change-Id: I41208bdc6b511f69a010c9fc38a936521beba7d5
2012-03-24 20:14:42 +09:00
Tadashi G. Takaoka
fce9ca4202 Merge "Remove verbose debug message" 2012-03-23 06:25:13 -07:00
Tadashi G. Takaoka
61f24842c7 Remove verbose debug message
Change-Id: I05bfe24228a6fbe806987d2a0d81e59611c3b476
2012-03-23 22:23:56 +09:00
Jean Chalard
71f9d30b18 Correct a shaky processing and move it to a better place
The old code would remove caps from the first letter if
auto-capsed but that makes very little sense when the word
is camel-cased. Also, it would not correctly handle
surrogate pairs, and would require a direct reference to
LatinIME and a specific method to do the processing in an
unexpected place.

Change-Id: I416d6a805242788a2473f007ca7452c9fe3f5205
2012-03-23 21:40:07 +09:00
Jean Chalard
3ee7d97587 Optimization and typo fix
Change-Id: Iafa414b8bcf2cca4569b3753bfac58f301a72269
2012-03-23 21:29:30 +09:00
Jean Chalard
e7cfe43652 Merge "Don't rely on spell checker proximity in tests" 2012-03-22 02:15:29 -07:00
Jean Chalard
109728193e Don't rely on spell checker proximity in tests
This fixes the input logic tests that were broken and suppresses
their dependency upon the spell checker proximity. Instead, it
gets the Keyboard instance from Latin IME and uses the actual
coordinates, which results in a test run closer to what actually
happens during typing.

Change-Id: I3a81d249ee7fb3ac6ae6940aa2e8b2421e829e5c
2012-03-22 18:08:23 +09:00
Kurt Partridge
fdd68f0657 log through group level abstractions
For the groups:
- LogGroup.MOTION subfields now deteremined in Utils.writeMotionEvent() rather
  than in LatinKeyboardView.processMotionEvent()
- LogGroup.KEY is now logged throguh LatinIME.onCodeInput() rather than
  Utils.push().  This catches keys more generally, including modifiers, and
  records touch positions for everything.  Removed now-redundant
  Utils.writeBackspace() and Utils.writeChar().
- LogGroup.CORRECTION uses Utils.writeCorrection(), and formats instead of
  leaving this to callers.
- LogGroup.STATE_CHANGE uses Utils.writeStateChange().  Optional fields are
  still left to callers, as this group has more variety.

Formats have changed to incorporate new fields.

Minor housekeeping:

ENABLE_USABILITY_STUDY_LOG constants replaced with variable references, as
the logging feature can be changed in Settings and therefore dynamically
changes.

New log format:

20120322-111203.621+0900        1332382323621   s       [onStartInputView]      com.socialnmobile.dictapps.notepad.color.note   2131624043      147457  1140850694
20120322-111204.912+0900        1332382324912   m       [Down]  2782355 0       243     171     0.5666667       0.895
20120322-111204.975+0900        1332382324975   m       [Move]  2782419 0       240     171     0.6     1.17
20120322-111204.983+0900        1332382324983   m       [Move]  2782428 0       238     171     0.6     1.1899999
20120322-111204.992+0900        1332382324992   m       [Move]  2782437 0       236     171     0.6     1.1899999
20120322-111205.002+0900        1332382325002   m       [Move]  2782446 0       232     170     0.6     1.1899999
20120322-111205.012+0900        1332382325012   m       [Move]  2782456 0       227     169     0.6     1.125
20120322-111205.021+0900        1332382325021   m       [Move]  2782465 0       224     168     0.6     1.125
20120322-111205.031+0900        1332382325031   m       [Move]  2782475 0       221     167     0.6     0.895
20120322-111205.040+0900        1332382325040   m       [Move]  2782483 0       213     164     0.6     0.58
20120322-111205.047+0900        1332382325047   m       [Up]    2782491 0       213     164     0.6     0.58
20120322-111205.052+0900        1332382325052   k       'D'     243     171
20120322-111205.228+0900        1332382325228   m       [Down]  2782622 0       171     71      0.6333334       1.275
20120322-111205.243+0900        1332382325243   m       [Move]  2782677 0       178     69      0.6333334       1.275
20120322-111205.325+0900        1332382325325   m       [Up]    2782750 0       178     69      0.6333334       1.275
20120322-111205.333+0900        1332382325333   k       'e'     171     71
20120322-111205.509+0900        1332382325509   m       [Down]  2782936 0       265     139     0.53333336      0.885
20120322-111205.512+0900        1332382325512   m       [Move]  2782954 0       265     141     0.53333336      1.04
20120322-111205.552+0900        1332382325552   m       [Move]  2782973 0       265     143     0.5666667       1.14
20120322-111205.663+0900        1332382325663   m       [Up]    2783102 0       265     143     0.5666667       1.14
20120322-111205.668+0900        1332382325668   k       'f'     265     139
20120322-111206.140+0900        1332382326140   m       [Down]  2783584 0       348     352     0.53333336      0.675
20120322-111206.206+0900        1332382326206   m       [Move]  2783648 0       348     354     0.5666667       0.73499995
20120322-111206.223+0900        1332382326223   m       [Move]  2783666 0       348     356     0.5666667       0.545
20120322-111206.232+0900        1332382326232   m       [Up]    2783674 0       348     356     0.5666667       0.545
20120322-111206.236+0900        1332382326236   k       ' '     348     352
20120322-111206.245+0900        1332382326245   c       [----]  Def             -1

Bug: 6188932
Change-Id: Iea46a0c683f858b72005b8e81191ef1d70262dca
2012-03-22 12:02:10 +09:00
Kurt Partridge
140467b8b6 Updated logger to record touch position within backspace key events.
Bug: 6188932
Change-Id: Ida2aff618153792f9803f30f1251d67c89af1fe0
2012-03-20 23:29:34 +09:00
Jean Chalard
9ffb94fa13 Rename the user history dictionary.
UserBigramDictionary -> UserHistoryDictionary.

Also update all methods, strings and comments, except those needed
for backward compatibility (which only include the name of the
database file).

Change-Id: I0bccea29880dc566b90100575b83baaa947b03ae
2012-03-19 12:03:51 +09:00
Ken Wakasa
660776e09b Small performance improvement by removing interface accesses.
Change-Id: I6d91f3b086470b79306dbe2874db9748b9e0eb5f
2012-03-17 01:53:51 +09:00
Jean Chalard
c68d1bbfaf Move the UserUnigramDictionary functionality over
UserBigramDictionary now assumes both functionalities. It will
be renamed to UserHistoryDictionary in a future change.

There are several reasons to do this. First, there is a lot of
duplicate code in User{Unigram,Bigram}Dictionaries that are
factored by the few lines of code in this change. Also, other
dictionaries like BinaryDictionary or ContactsDictionary all
assume both responsibilities, as should be the case
theoretically.

It is also possible to do this because previous versions don't
write any unigram data that we'd want to reuse. For even older
versions that do write data, we can't really make any sense out
of it. Bigram data however can be useful, and this allows us to
reuse it easily.

Change-Id: I755525f92744e1536eaef097527e8151b7859a30
2012-03-16 17:01:57 +09:00
Jean Chalard
c24f66e180 Streamline some user history dictionary code
A lot of things don't really make sense in the old code.
Let's streamline it for now so that we have a cleaner interface
to work with. This is preliminary work for bug 4192129.

Change-Id: If01a5974cfadc43afced610c57fcf7fde67c1346
2012-03-16 12:22:39 +09:00
Jean Chalard
3fe263fac6 Extract an annoying method call
Change-Id: I78f22bb38222fea54a55e460fcf728bf941d15e9
2012-03-15 19:30:15 +09:00
Jean Chalard
6ec1209a33 Fix a bug where quotes and dashes are considered letters
Bug: 6174065
Change-Id: I702760d44ead0eeb60d06360aa3bb03c2ec73325
2012-03-15 18:18:52 +09:00
Jean Chalard
2be7a37acf Small cleanup
Exit-fast, update comment, make a method private

Change-Id: Id103bf03aeef43a1a4d064ecabb819490dc5d39a
2012-03-15 15:54:25 +09:00
Jean Chalard
03a3517075 Add info for obsolete suggestions in SuggestedWords
Change-Id: I9684c7b08244b34853ce8a99b6e9d885389f6687
2012-03-15 13:12:08 +09:00
Jean Chalard
f985efe39c Remove a useless parameter
Change-Id: I03005240238fb004c20b2df0d836796e2e8b307f
2012-03-14 18:12:12 +09:00
Jean Chalard
bdf6d1b18b Remove a useless method
Change-Id: I208dd2e725e37c2fb3cd51fe48194679e5912f6b
2012-03-14 15:59:04 +09:00
Jean Chalard
7d55c891af Make the Builder private
Change-Id: I2184084f4b7729c4324f8291d548bd4c4c2872a1
2012-03-14 15:42:14 +09:00
Jean Chalard
5b0643f50d Re-sequence the last calls to build()
Change-Id: If77ee5aa9483d3ca03c52812f31665dee6468e99
2012-03-14 14:19:24 +09:00
Jean Chalard
88bf1ba526 Move up the static methods of the Builder
Change-Id: Ic3e07b745b7b24cae0f772ea49e0de615b44caf9
2012-03-14 13:10:22 +09:00
Jean Chalard
8e19b1183e Kill the last place where the Builder was being used
I had missed that one

Change-Id: I9a5040a7a61e294396aa424de96a69dbb15f037a
2012-03-14 13:10:12 +09:00
Jean Chalard
e3afb7d192 Make the Builder fully immutable at last
Change-Id: Ie399ca7a9e76ccab44a92bc378d11f92392fed2c
2012-03-13 20:33:13 +09:00
Jean Chalard
ec471c72f8 Add to SuggestedWords a missing parameter, and use it.
Also stop using Builder between its creation and the call to
the #build() method.

Change-Id: Ie1fc3ec7b6f4c7c3789f672f4e26b4bf58c3e062
2012-03-13 20:19:21 +09:00
Jean Chalard
2e2519ee91 Make still more members of the Builder final.
Change-Id: Ic455f97247da5e40d4939555ab639ecffef36e2d
2012-03-13 20:05:00 +09:00
Jean Chalard
b5eeb724fc Make some more Builder attributes final.
Change-Id: I3132b7fe4ee97c566736bfc21c3783cfc79fc7ff
2012-03-13 19:53:38 +09:00
Jean Chalard
c60fea852d Make the suggested word list final in Builder.
Change-Id: I2ddfab00dc8c141fc989a051f16eb2b3571b7e86
2012-03-13 19:37:17 +09:00
Jean Chalard
674ffcdf93 Make an add into a set.
This method now only sets words, so it should be named set.
The functionality is identical since there are no more places
where the list is reused.
This will also allow to make the list final in an upcoming change.

Change-Id: I25b0c7d7f13c3fa5d89806f01f48f1026769603f
2012-03-13 19:07:42 +09:00
Jean Chalard
4ee186920e Remove a method that causes annoying side-effects.
...and replace by a call to a central method.

Change-Id: I93d0a2c2e99963a5b69923d1062d0e01853216b6
2012-03-13 18:22:49 +09:00
Jean Chalard
d0d4074392 Remove a useless parameter.
Change-Id: I7625bf17158c207ad7e8cd496bef825704173c4c
2012-03-13 15:34:06 +09:00
Tadashi G. Takaoka
4c0c638a18 Use Animator to draw language name on spacebar
Note that Animator class exists in framework only on Honeycomb or
later.

Change-Id: Ie3392dbf8acc1547ebb2d16e04086c911d961aed
2012-03-13 14:25:57 +09:00
Jean Chalard
1dfef0336d Make a method static
Change-Id: Ie1d460562d38105abe91ae2da17cafd49e2cd394
2012-03-12 15:00:36 +09:00
Ken Wakasa
c1ca8815f5 Fix an obvious bug in handleLanguageSwitchKey()
bug: 5759092

Change-Id: I8c7b2ef024cbab399d96f6b3ec553da4e9d2fb18
2012-03-11 00:44:47 +09:00
Jean Chalard
68823ae08e Make the safety net memory private
Change-Id: I10959d47c980d2e8f2ea995955acf02193e3ff7b
2012-03-09 22:01:15 +09:00
Jean Chalard
d5f618e90a Remove a useless test
If we are not composing a word here, we have already returned

Change-Id: I63281abace777e3658286d4df6781d2cd5a29c33
2012-03-09 20:53:45 +09:00
Jean Chalard
c5d2bb786e Don't use an intermediate object with a different meaning
Change-Id: Ie89916b49c852a51385ffd61cb596a58f23a46a0
2012-03-09 20:51:33 +09:00
Jean Chalard
ed9986824e Move some auto-correction logic to where it belongs
Change-Id: I897c5ec3a630a4a6bfc593906df4d3fc7b244482
2012-03-09 20:45:37 +09:00
Jean Chalard
dfd4abe818 Fix a shameful bug
I must have been sleeping when I wrote that

Change-Id: I887180ab610785a2000636adeeed99230b3c5390
2012-03-09 19:31:35 +09:00
Jean Chalard
0cf422fbb7 Reduction, step 8
Change-Id: I54334039597e235e24f169e34c1d44109180ee88
2012-03-09 19:00:29 +09:00
Jean Chalard
a333ff19ef Reduction, step 7
Change-Id: I177ef2f29c8b6000c5e3d021c016c5d216fe3fc6
2012-03-09 18:59:20 +09:00
Jean Chalard
a3ee019331 Reduction, step 6
Change-Id: I22ad4cea0e0cac23813da7e788f5c94974ce0ebf
2012-03-09 18:58:01 +09:00
Jean Chalard
de165aed2a Separate bigram prediction from suggestion process
Change-Id: Ibdef206fbd6688a45cebbd7fb8a9f6cd175d03b0
2012-03-09 18:38:20 +09:00
Jean Chalard
6f722c8301 Remove useless stuff
Change-Id: I462d24da2d26661990d6aab2a13fde851763fd61
2012-03-09 18:36:52 +09:00
Jean Chalard
67af2a2415 Export some more logic out of Latin IME
Change-Id: Ib264533a05e9e09347bf254789e6ab5beec92400
2012-03-09 18:36:49 +09:00
Jean Chalard
df9fce5df1 Export some logic out of LatinIME
Hopefully that will end in Suggest/SuggestedWords being autonomous
and won't need the logic spoon-fed to them

Change-Id: I915661bce13c69c8a5b8e5d4a8c41e18fea594cf
2012-03-09 18:36:45 +09:00
Jean Chalard
91e55ac000 Small optimization
We only use some of those results in one branch of an if() test.
Let's not compute those that are not needed.

Change-Id: I6ca068646b86d2980fb88e75b110ad077362c4ff
2012-03-09 16:47:43 +09:00
Jean Chalard
195419b1ec Small reorganization
...resulting in a slight optimization

Change-Id: I83a9b8c92c3d93ce75988285997ec138b3ffe52e
2012-03-09 16:41:35 +09:00
Jean Chalard
838629aea0 Remove useless test
typedWord may not be null here

Change-Id: I9e7afb89fafbf6fcbc91fbc132aecc06aec8979f
2012-03-09 15:52:23 +09:00
Jean Chalard
5a7cb9305a Merge "Remove a provably useless test (B4)" 2012-03-08 22:22:20 -08:00
Jean Chalard
31a5da28e3 Merge "Move some code around (B1)" 2012-03-08 21:15:25 -08:00
Jean Chalard
8cd847c2fa Remove a provably useless test (B4)
If !mInputAttributes.mInputTypeNoAutoCorrect then mCorrectionMode
will not have allowed #hasAutoCorrection() to return true.

Change-Id: I1b498d5aeb26194c765cc9b9dcb24d980de43894
2012-03-09 12:56:48 +09:00
Jean Chalard
dc5dfe37e0 Move some code around (B1)
The goal is to make the creation of the Builder closer to
the #build() call

Change-Id: I48d76d4efdc180479829016582edd9de47e7332c
2012-03-09 12:33:23 +09:00
Jean Chalard
13fb8fb775 Limit escape of parameters
Change-Id: I3a7ab069042d5542ab2e033d1eeb13d718cd7698
2012-03-09 12:30:23 +09:00
Jean Chalard
21af2f40c5 Merge broadcast receivers again
It's probably simpler not to have registers dance around,
and just message the feedback manager when the audio event
happens.

Change-Id: Id0710ed102d10d01f1af93ad8cb660653bb3a9f8
2012-03-09 11:00:23 +09:00
Jean Chalard
7b77c683d7 Fix a crash
Bug: 6137076
Change-Id: I05f9f72a2678d10d3400dab5fc71544276739dcf
2012-03-09 10:29:51 +09:00
Tadashi G. Takaoka
f686211183 Merge "Split Utils class to StringUtils, SubtypeUtils, and JniUtils" 2012-03-08 03:59:59 -08:00
Tadashi G. Takaoka
cc8c8b99bd Split Utils class to StringUtils, SubtypeUtils, and JniUtils
Change-Id: I09e91675fe7d573dad8c933ad513b21d7e409144
2012-03-08 20:30:38 +09:00
Jean Chalard
0f1efae262 Merge "Cleanup unused imports (A7)" 2012-03-08 02:32:48 -08:00
Jean Chalard
663aabca0c Merge "Get the view for haptic feedback as a parameter (A6)" 2012-03-08 02:32:39 -08:00
Jean Chalard
7cfae83434 Merge "Export audio and haptic feedback to a specialized class. (A1)" 2012-03-08 02:31:45 -08:00
Jean Chalard
8667bbeab3 Small rename
Left/Right is wrong terminology here

Change-Id: I58c55849e45d9984dd3fb7b75a64e07667c9eba4
2012-03-08 18:49:38 +09:00
Jean Chalard
41a2929282 Cleanup unused imports (A7)
Change-Id: I48ba12e4311cbf2982ee8f5312b279bc8c1fdfe8
2012-03-08 18:37:03 +09:00
Jean Chalard
544c3c2952 Get the view for haptic feedback as a parameter (A6)
It's rather annoying (and possibly dangerous) to keep this as a member.
Get it from outside.

Change-Id: I00c42db96395fb65204fb140aeedc82bf312a86e
2012-03-08 18:37:00 +09:00
Jean Chalard
564496bad6 Export audio and haptic feedback to a specialized class. (A1)
Change-Id: I957d883d1ccf188cb98eb11031aa0a32fce4ed76
2012-03-08 18:35:20 +09:00
Jean Chalard
f8b39f39cd Merge "Remove a useless class (B4)" 2012-03-08 01:14:33 -08:00
Jean Chalard
4b656a3fef Merge "Remove stuff that's not used any more (B3)" 2012-03-08 01:13:06 -08:00
Jean Chalard
d8447ec353 Merge "Use the simple auto-correction status (B2)" 2012-03-08 01:12:46 -08:00
Jean Chalard
fbe767cec5 Merge "Remember auto-correction status simply (B1)" 2012-03-08 00:54:30 -08:00
Tadashi G. Takaoka
c648b88779 Merge "Dynamically determine key preview backing view height" 2012-03-07 04:17:52 -08:00
Tadashi G. Takaoka
c8b0e5797e Dynamically determine key preview backing view height
Bug: 6023947
Change-Id: I53a5c0eb99100a0dfe3e025808f5dc55747d1287
2012-03-07 20:33:17 +09:00
Jean Chalard
dab392c6f4 Merge "Fix a bug with successive manual picks" 2012-03-07 01:51:59 -08:00
Jean Chalard
3dd4bcb283 Merge "Recompute suggestions on language change." 2012-03-07 01:35:12 -08:00
Jean Chalard
b84ee82e66 Recompute suggestions on language change.
Bug: 6106407
Change-Id: I43d9c89610a9ed7a9f6825bd90334d7b343df52c
2012-03-07 17:35:32 +09:00
Jean Chalard
845b24d9d3 Fix a bug with successive manual picks
Bug: 6121571
Change-Id: Ib16fbef1087da3b7da5539901ec57156f242f089
2012-03-07 17:32:42 +09:00
Jean Chalard
f773ef19e8 Remove a useless class (B4)
\o/

Bug: 5975068
Change-Id: Ia18b55af6d555e7ee7af1cdd7c6227fc1ee6786b
2012-03-07 15:34:15 +09:00
Jean Chalard
a0beebf711 Remove stuff that's not used any more (B3)
Change-Id: Ie86675ff2facd37430051bf129ddd930fb933dc9
2012-03-07 15:32:55 +09:00
Jean Chalard
0a59ac2ba8 Use the simple auto-correction status (B2)
Change-Id: I9d2f053b6f7bad20fc6afe5f5086a965e5014a5c
2012-03-07 15:31:22 +09:00
Jean Chalard
70852c91dc Remember auto-correction status simply (B1)
This duplicates the functionality in ComposingStateManager at
a fraction of the cost. It's not used yet.

Change-Id: Ica2607fb2f7c41e11189fcb566e253db8f62596f
2012-03-07 15:20:01 +09:00
Tadashi G. Takaoka
65fe7f7994 Merge "Add language switch key only to the phone layouts" 2012-03-06 18:19:45 -08:00
Tadashi G. Takaoka
81d4e3cd66 Add language switch key only to the phone layouts
Bug: 5759092
Change-Id: Ic7d7d4812976654c0e85fecabd1128eadfc52c5c
2012-03-07 10:03:21 +09:00
Jean Chalard
89ffb212b4 Make the keyboardswitcher and the subtypeswitcher final.
Change-Id: Ifcc79357adcc53f93b190b6e98d5569f42f74655
2012-03-06 19:07:21 +09:00
Jean Chalard
3cd1a00eca Resolve a todo
This exports some voiceproxy complexity to voiceproxy rather
than keeping it in latinime

Change-Id: I0b3523e77af4104cc3ed28417956059c734c8bfe
2012-03-06 18:43:18 +09:00
satok
231ef8fa3e Merge "Integrate the logic to calculate the proximities" 2012-03-05 23:25:29 -08:00
satok
ca7ec2097c Integrate the logic to calculate the proximities
Bug: 4343280

Change-Id: I0f6a7e6912ed4abea07c10d266da4c7ccb0dae76
2012-03-06 15:34:27 +09:00
Jean Chalard
00ed3be95c Correct special space handling of punctuation
This fixes two defects:
- One where some separators should promote a phantom space to
a real space. This bug had a unit test but wasn't tracked.
- One where French punctuations would behave incorrectly. Tracked
Bug: 6113693

Change-Id: Ia7f86fc960e00141757632ab2c9bce9168dd6966
2012-03-06 14:00:34 +09:00
Tadashi G. Takaoka
e79b1a8312 Make SuggestedWords immutable completely
Change-Id: I1b0f7b857e89307c987187c1969a2846aa97fdcc
2012-03-05 23:06:37 +09:00
Tadashi G. Takaoka
8cc8f26adf Make SuggestedWords partially immutable
Change-Id: I72a2f71d7f6565a30c06e563b0a64f496542cde9
2012-03-05 22:11:13 +09:00
Tadashi Takaoka
d5b6360549 Merge "Revert "Make SuggestedWords immutable"" 2012-03-05 02:57:00 -08:00
Tadashi Takaoka
d62fa834c6 Revert "Make SuggestedWords immutable"
This reverts commit c208f4dfb7
2012-03-05 02:54:21 -08:00
Jean Chalard
6a830277df Merge "Refactoring" 2012-03-05 01:49:46 -08:00
Jean Chalard
611a5bdf65 Refactoring
Change-Id: I2f92c01fa1ff6b318128d387f26942b5d47de3e0
2012-03-05 18:36:51 +09:00
Tadashi G. Takaoka
c208f4dfb7 Make SuggestedWords immutable
Change-Id: I26bd82aee5ead84e40abfc3db5a48ed6d1e42361
2012-03-05 17:24:30 +09:00
Jean Chalard
895b70b8af Move some treatment to a more sensical place.
It makes more sense to catch words with the safety net in
updateSuggestions() than in showSuggestions(). Also, it's useless
to do it in updateBigramPredictions, because the result will
always be provably false.
This will also help with writing unit tests.

Change-Id: Ifab81e6c5a74b1aa75cf85ef7742fee69a98f5ce
2012-03-05 14:27:49 +09:00
Jean Chalard
9b01890254 Move a method to a more sensical place.
Change-Id: I11f87448f689cf828bff960ad7a3e4739a3457dc
2012-03-05 14:19:35 +09:00
Jean Chalard
428178aca6 Merge "Replace a useless computation with a constant" 2012-03-04 19:35:11 -08:00
Jean Chalard
4ab5486bf2 Merge "Remove a useless test" 2012-03-04 19:35:02 -08:00
Jean Chalard
4e112d0782 Replace a useless computation with a constant
This is provably always false

Change-Id: I88d783fa59fec0b7a729558ba974a6a58c158645
2012-03-05 11:57:36 +09:00
Jean Chalard
a04d2358c0 Remove a useless test
With the current logic, this test provably always resolves
to false.

Change-Id: Iba84ef5f3a14cd8ac48c6a813519ab283bf605f8
2012-03-05 11:38:45 +09:00
Tadashi G. Takaoka
49079df8ec Merge "Omit InputMethodManagerCompatWrapper argument from some utility methods" 2012-03-04 18:12:47 -08:00
Tadashi G. Takaoka
2d25ba2750 Omit InputMethodManagerCompatWrapper argument from some utility methods
Change-Id: Ic837018c702c8c575de3e5e81fe8e31fee16fe22
2012-03-05 10:43:12 +09:00
Jean Chalard
a83a53ba24 Some renaming
Change-Id: I445277cb3af469a0145a8da0ffb801b7e19048cd
2012-03-02 20:46:54 +09:00
Jean Chalard
dd931c47be Some more simplification
I wish "are we autocorrecting?" was not computed in a dozen
places all depending on a hundred code paths
More than likely, this fixes very subtle discrepancies
between auto-correction indicator with the underline and with
the LED on the spacebar - which is not displayed any more in
the current version anyway. Especially, the LED probably
would have been off when the word was caught by the safety net.

Change-Id: Idda3021771081d6155b06915e728ecd64d9e042e
2012-03-02 20:34:10 +09:00
Jean Chalard
e2a50bd804 Optimization
Avoid doing some useless processing.

Change-Id: I4ce0a188e10db30322bd25751dc5c09492cea301
2012-03-02 20:26:51 +09:00
Jean Chalard
7204eab3da Precompute two values that never change
Change-Id: Ic54e7926028ea8374564da5e5004d710f42c53e1
2012-03-02 20:04:42 +09:00
Jean Chalard
38e535e596 Change a parameter type to make a call clearer
Change-Id: I2918d0a8b00da743689b919f80128bbf36973f24
2012-03-02 20:01:34 +09:00
Jean Chalard
5bc2b61274 Move a method up a level
Change-Id: I6b9a697480127e4745698ab19f8a360b86ff39ca
2012-03-02 19:59:55 +09:00
Jean Chalard
d02783cb63 Break out a method
Change-Id: Ia14fc320422b7f198c33ba522bb93dd70fbcb2c1
2012-03-02 19:52:06 +09:00
Jean Chalard
d992fa847d Small refactor (A1)
Change-Id: Ia0838bbce47a2b60067f464685ad6d55ee4ec934
2012-03-02 18:55:04 +09:00
Jean Chalard
fa12acb8b7 Change a dangerous ID
The message id 0 is used intrinsically by the framework
for all messages without a specific ID. Using 0 here
we can't reliably use the post(Runnable) method on our
handler, because these would in *some* respects be taken
for update_suggestion messages, but not all.
For example, they'd be removed on removeMessage() but
they would not trigger the actual process. This would
lead to utter confusion.

Change-Id: I5d9b01d38e2ff090cd0d80c27421dc8a41c317b8
2012-03-01 19:05:51 +09:00
Jean Chalard
5935950d44 Rename cancelCommit to revertCommit
This wording is easier to understand, and it matches the other
revert* functions.

Change-Id: Ibc2ec79fb5a0f9bf508e5cdeb75e54abd9241d0c
2012-02-22 01:09:23 -08:00
Jean Chalard
4fef31510d Remove a useless code path (A7)
This is never called any more, since we now use the cancelCommit
path to react to a backspace after a manual pick.
This concludes the run of changes to implement feature
request #5968922

Change-Id: I23df653bb2a3de2ba0152394d5d616a42ac7519b
2012-02-22 01:05:36 -08:00
Jean Chalard
bdf89ce5fe Rename cancelAutoCorrect to cancelCommit (A6)
Also remove a test in debug mode that would check for absence of
a situation which is now expected.

Change-Id: Ia5be350bc98a604b3bf8f6057652c5534f6a19af
2012-02-22 00:59:01 -08:00
Jean Chalard
2aa16dd81f Merge "Activate the code to cancel a manual pick (A5)" 2012-02-22 00:50:13 -08:00
Jean Chalard
80c25df49d Merge "Implement cancelling a manual pick (A4)" 2012-02-22 00:29:23 -08:00
Jean Chalard
8db74d0fae Merge "Use the stored separator instead of reading it back (A3)" 2012-02-22 00:24:19 -08:00
Jean Chalard
9271b770e8 Activate the code to cancel a manual pick (A5)
This finally makes active the behavior described in
Bug: 5968922

Change-Id: I363ed23270c3dea75411ea806011225097b5d07c
2012-02-22 00:05:19 -08:00
Jean Chalard
32f0af1fc4 Implement cancelling a manual pick (A4)
This is new code, but simple code. The new code path is never
used for now, but it will be in an upcoming change. This serves
to implement feature request #5968922

Change-Id: I3e67731ec6e9fc0b86c5cbd972e9c081781c11a9
2012-02-22 00:00:51 -08:00
Jean Chalard
193d23f40e Use the stored separator instead of reading it back (A3)
Now that we have stored our committing separator, we can use
it directly instead of reading it back from the text view
paying the IPC cost. This prepares for feature request #5968922.

Change-Id: Ifeaa2d659cf12b91c89d28e6ff7d07a669258184
2012-02-21 23:56:36 -08:00