Satoshi Kataoka
46eea3c13f
Merge remote-tracking branch 'goog/master' into mergescript
...
Conflicts:
native/jni/Android.mk
Change-Id: I5e4657b0949274ce29315a2c9047db428d5455af
2012-07-06 16:35:27 +09:00
Jean Chalard
362ea3cacb
Merge "Remove useless code (A61)"
2012-07-06 00:15:57 -07:00
Jean Chalard
ea2ee86e56
Merge "Simplification (A60)"
2012-07-06 00:11:48 -07:00
Jean Chalard
9d95a107a5
Merge "Simplification & UI improvement (A59)"
2012-07-06 00:08:12 -07:00
Ken Wakasa
3378a244dc
Merge "Revert "Fix the build""
2012-07-05 23:59:53 -07:00
Ken Wakasa
f52c1c50ef
Revert "Fix the build"
...
This reverts commit 48a436081f
.
2012-07-06 15:53:51 +09:00
Jean Chalard
01606c385b
Merge "Show predictions in the right cases (A58)"
2012-07-05 23:42:41 -07:00
Ken Wakasa
48a436081f
Fix the build
...
Change-Id: Iff324c705b46cfae27ea9b6b8dc8b0a0d56a193d
2012-07-06 15:35:13 +09:00
Ken Wakasa
70ba3340a1
Merge "Update Makefile of LatinIME native code for the unbundled build"
2012-07-05 23:19:45 -07:00
Ken Wakasa
c646102b94
Update Makefile of LatinIME native code for the unbundled build
...
Change-Id: I117e2429c5f5e75a6ffe84b5869afb2e033f2b2d
2012-07-06 15:17:11 +09:00
Jean Chalard
66a2e96fb4
Remove useless code (A61)
...
Just after this, clear() will be called, removing the suggestion
strip from the screen. It will later be displayed again through
onStartInputView, which will update its content.
Change-Id: I15c23ad2adecab76b0791d7fc222d15b6533f3bd
2012-07-06 13:07:48 +09:00
Jean Chalard
b1dc8ad5f2
Simplification (A60)
...
Change-Id: I99e912d3edfc7dd3f17ee835331d5fcba976750c
2012-07-06 13:07:48 +09:00
Jean Chalard
663dbfd1cc
Simplification & UI improvement (A59)
...
The responsivity is better like this. This does not seem to
feel slow as the previous comment seemed to indicate.
Also remove a stale comment.
Change-Id: I4e7bf9fe28716e112db182e44b3fa88ee4526bb4
2012-07-06 13:07:48 +09:00
Jean Chalard
746e014eb5
Show predictions in the right cases (A58)
...
After reverting an auto-correct we always have a separator after
the previously inserted word, and the cursor is never touching
a word. Showing predictions is the right thing to do, while
calling postUpdateSuggestions will invariably yield an invariably
blank suggestion strip, which is not very helpful.
Likewise, after we pick a suggestion, we should be showing the
predictions unless showing the addToDictionary hint. There was
a bug here in the corner case that the word would be a candidate
for user dictionary, but the user dictionary provider is not
available: in this case we should be showing predictions, but
we were showing an unhelpful empty suggestion bar.
Change-Id: I287bb5eb4af762bd5a433e85e185fab6d203e91a
2012-07-06 13:07:48 +09:00
Jean Chalard
0e9e7e337d
Cleanup (A57)
...
We stopped cancelling manual picks a few weeks ago. This code
is dead.
Change-Id: I4032fcc3c95e9379f1839fe860a1b8a9bd7d0bc7
2012-07-06 13:07:30 +09:00
Ken Wakasa
b8add1a24e
Fix jb-ub-latinimegoogle build
...
Change-Id: I38829600b86309c90f831cfd0bf8f66b02ce524a
2012-07-06 12:52:20 +09:00
Jean Chalard
29eeef75ec
Merge "Fix a bug where the caps mode would not be changed"
2012-07-05 19:11:28 -07:00
Jean Chalard
f254e3fec7
Fix a bug where the caps mode would not be changed
...
Bug: 6766059
Change-Id: I378f9d35c4904c4f373260bda5863235d833eb31
2012-07-06 11:08:20 +09:00
Ken Wakasa
881a162ab8
Add LOCAL_SDK_VERSION and LOCAL_NDK_VERSION
...
Change-Id: Icd3740d409f6627eb1ebcf3fff5373cb365a28fb
2012-07-05 20:14:58 +09:00
Jean Chalard
d81e7d24d3
Simplification (A56)
...
If suggestion and prediction messages both happen to be in
the queue, the latest one will win (update the suggestion strip
later than the other, overwriting any previous suggestions).
So when we enqueue either one, it is always safe to cancel
all messages of both types.
Change-Id: Iad9dd06d08c49f60cac16b88edcc9531a18ec02e
2012-07-05 18:19:51 +09:00
Jean Chalard
414f14436e
Remove an unused method (A55)
...
Change-Id: I9974b88923b85cd6bec74f7607067c660f36f040
2012-07-05 18:10:37 +09:00
Jean Chalard
c84f178cd9
Merge "Remove a useless method, rename another. (A54)"
2012-07-05 02:05:50 -07:00
Tadashi G. Takaoka
92d2f7e03b
Merge "Initialize SubtypeLocale from Settings"
2012-07-05 02:04:35 -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
d6ac0443f0
Initialize SubtypeLocale from Settings
...
Bug: 6781106
Change-Id: I22f04af4fabf93346ab6f72c1841f096afaccb96
2012-07-05 17:39:30 +09: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
Satoshi Kataoka
d3187f0a81
Manual copy everything
...
Change-Id: Ia3f8713f4c854ad12c009f64a38040cf3ac69731
2012-07-05 17:03:19 +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
Satoshi Kataoka
086f069448
Merge remote-tracking branch 'goog/master' into mergescript
2012-07-05 16:55:07 +09:00
Satoshi Kataoka
3d2f5f8487
Merge remote-tracking branch 'goog/master' into mergescript
...
Conflicts:
java/src/com/android/inputmethod/keyboard/Keyboard.java
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/Suggest.java
Change-Id: I73c1cec1f4bca5139372392e93d55081d814fa6c
2012-07-05 16:53:56 +09:00
Tadashi G. Takaoka
133bb8544a
Merge "Fix upper case Eszett more key"
2012-07-05 00:52:08 -07:00
Ken Wakasa
1930f194c2
Update makefile
...
Change-Id: I36aee7f39856bbd29d7d33a188728819b245d4a5
2012-07-05 16:35:42 +09:00
Tadashi G. Takaoka
5946838b8e
Fix upper case Eszett more key
...
Bug: 6773873
Change-Id: I1a533c729c312a53663fb142cb6fcb4915b53206
2012-07-05 16:13:52 +09:00
Jean Chalard
0726f466f7
Merge "Add a wrapper to updateSuggestions / Predictions (A48)"
2012-07-04 21:08:21 -07:00
Tadashi G. Takaoka
7aeb7ef1ab
Merge "Fix Keyboard.getKey as thread safe"
2012-07-04 19:58:17 -07:00
Tadashi G. Takaoka
8f6c603b3b
Fix Keyboard.getKey as thread safe
...
This is a follow up of Id962e670.
Change-Id: I9e8542bff9e8faf57f934051fe612463c99ad61f
2012-07-05 11:43:43 +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
Jean Chalard
e9a86e2cdb
Search bigrams for the lower case version of the word (A46)
...
...if there aren't any for the exact case version.
Bug: 6752830
Change-Id: I2737148b01ba04a64febe009ceb2ef53c265d224
2012-07-04 20:12:58 +09:00
Satoshi Kataoka
12bbd2cd5e
Merge remote-tracking branch 'goog/master' into mergescript
...
Conflicts:
java/src/com/android/inputmethod/latin/SuggestedWords.java
Change-Id: I1ce6cd0846cb93a5c9bb2d9c3638d59f90232c26
2012-07-04 19:21:16 +09:00