Jean Chalard
fed702a0ad
Merge "Move a test (A77)"
2012-07-09 23:01:33 -07:00
Jean Chalard
75e605f7ca
Merge "Pull up common code in the consolidated method (A76)"
2012-07-09 22:41:33 -07:00
Jean Chalard
c466cd3f99
Move a test (A77)
...
Change-Id: I417bd5f1318696aaa39fee18f3e750ea5c231f6b
2012-07-10 14:24:33 +09:00
Jean Chalard
32f5384fc9
Pull up common code in the consolidated method (A76)
...
Change-Id: I3ebecec37b49e139c243cf9da8bfe491e7ddada1
2012-07-10 14:22:12 +09:00
Ken Wakasa
1e8fb312bf
Fix app name case
...
Change-Id: Id568adac98135cffceb111000e80f77928c045ea
2012-07-10 14:10:30 +09:00
Tadashi G. Takaoka
80973dc76f
Merge "A little optimization of InputPointers.copy"
2012-07-09 21:09:13 -07:00
Tadashi G. Takaoka
2ad6d12a30
A little optimization of InputPointers.copy
...
Change-Id: Id83b34e076ef91e06d7c1dd2b3ee7bb64d01b8cb
2012-07-10 13:05:43 +09:00
Jean Chalard
24e8a06f98
am 949d2ae5: am 4bcf70c9: Fix a bad interaction with mmap
...
* commit '949d2ae5788977c5e87e35e1bd1770f54ac88f5b':
Fix a bad interaction with mmap
2012-07-09 20:24:01 -07:00
Jean Chalard
949d2ae578
am 4bcf70c9: Fix a bad interaction with mmap
...
* commit '4bcf70c93106f17e3119fcb4c7ec9eaff6d54e4c':
Fix a bad interaction with mmap
2012-07-09 20:21:19 -07:00
Ken Wakasa
ea92b7b987
Avoid LatinIME crash
...
bug: 6790620
Change-Id: I6fd271c6f79790cfb9d875b052854eab60a30b7f
2012-07-10 09:57:04 +09:00
Ying Wang
0493bb2f10
Use TARGET_BUILD_APPS to distinguish
...
It's in a full build or just an unbundled build.
Bug: 6790620
Change-Id: Ifa2df86462747acb8b561ebab879e03b1201b4f7
2012-07-09 17:47:31 -07:00
Ying Wang
59205dd270
Import translations. DO NOT MERGE
...
Change-Id: I48fd690e9368a6637c7fa93c15b6ecadcbe47ce8
Auto-generated-cl: translation import
2012-07-09 13:56:48 -07:00
Ying Wang
6de3c3d12d
Import translations. DO NOT MERGE
...
Change-Id: I897db7b0c929fb3aa867c474888a98cfaac78245
Auto-generated-cl: translation import
2012-07-09 13:53:32 -07:00
Satoshi Kataoka
14ec214132
Merge "Separate string resource of IME name"
2012-07-09 02:26:35 -07:00
Satoshi Kataoka
516a0bb626
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-07-09 18:23:49 +09:00
Satoshi Kataoka
69aef47e23
Separate string resource of IME name
...
Change-Id: Ib4afefac0e87c814c9e54cb65e78ee584c3f954c
2012-07-09 17:48:39 +09:00
Tadashi G. Takaoka
7389c601e3
Merge "Add InputPointers.append() method"
2012-07-09 01:39:38 -07:00
Tadashi G. Takaoka
1087c53f5a
Add InputPointers.append() method
...
Change-Id: Id2b0e242f7e9ce0ca888067857f8b64c02fde84e
2012-07-09 17:33:10 +09:00
Jean Chalard
e4498929b0
Simple refactoring (A75)
...
Change-Id: Id19efc5d279616da52667fa70326b86aba70d4a0
2012-07-09 15:06:16 +09:00
Jean Chalard
d579f1aefc
Consolidate methods that do the same thing (A74)
...
Change-Id: I6e7c3aba2b40ecefa483c9680978bc806368e96e
2012-07-09 15:06:16 +09:00
Jean Chalard
347a80f793
Tiny refactoring (A73)
...
If !mWordComposer.isComposingWord(), then mWordComposer.getTypedWord()
will always return an empty string.
Change-Id: Ife66d0abc44c743cbc30d31724e833cda168fd5c
2012-07-09 15:06:16 +09:00
Jean Chalard
7a422a0142
Cleanup again (A72)
...
Change-Id: Id3765bf9826cc2c7ca70158cda53c75dc58f51c6
2012-07-09 15:06:16 +09:00
Jean Chalard
37eaa24b5a
Simplification (A71)
...
Change-Id: I7a91d84291bea581ecc8ec5b29b9a87ccec76e7d
2012-07-09 15:06:16 +09:00
Jean Chalard
dc1b84d96c
Defer testing composition to a later time (A70)
...
This is not exactly the same logically speaking, because it's
theoretically possible that the composing state changed in between
the message enqueueing and it's retrieval. However in the practice,
if the composing state changed the message *must* have been
cancelled and resent, else the behavior breaks. So this actually
is more robust, and removes some obscure requirements on the
calling code.
In the practice, it should also make the cancelUpdateSuggestionStrip
message useless, although this change does not yet remove it.
Change-Id: I75141920ce64e38e2f92e9c02b6c979936eee9a9
2012-07-09 15:06:16 +09:00
Jean Chalard
a6757f400a
Code simplification (A69)
...
Change-Id: I2a77e437795fbbea47fd2e604ee6c26f8d0e458a
2012-07-09 15:06:16 +09:00
Jean Chalard
8f9c9377fc
Consolidate two methods (A68)
...
Change-Id: I4b91414190b3786065ebd962a76299b605e5797e
2012-07-09 15:06:15 +09:00
Jean Chalard
146bd2e456
Pass the value we really want to pass to update functions (A67)
...
Change-Id: Ica9b875d119dea2f8dc237fd63e5b4eaa5e1c400
2012-07-09 15:06:15 +09:00
Jean Chalard
60dbe0be43
Preparative change to pass a boolean with known value (A66)
...
Change-Id: Iff03fe7c4a8eec17c00a2fe99197e0cf21a0630a
2012-07-09 15:06:15 +09:00
Jean Chalard
853f4221ab
Merge "Remove useless processing (A65)"
2012-07-08 23:05:11 -07:00
Tadashi G. Takaoka
9c0ddb5988
Merge "Remove unused WordComposer.init method"
2012-07-08 18:33:56 -07:00
Satoshi Kataoka
f4eb4f0c79
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-07-06 20:46:22 +09:00
Ken Wakasa
1a9ef01187
Add a copyright header to AndroidManifest.xml
...
Change-Id: I588d7acc6f64360404440ad8dc2c00296046b09d
2012-07-06 20:29:08 +09:00
Tadashi G. Takaoka
6b4ce58fc6
Remove unused WordComposer.init method
...
Change-Id: I46c6a6e1c1536599cb909bf81297001b238f2ec8
2012-07-06 20:12:14 +09:00
Tadashi G. Takaoka
36311cacd6
Merge "Extend onTextInput to be able to inject suggestions"
2012-07-06 03:40:03 -07:00
Tadashi G. Takaoka
4be03befe3
Extend onTextInput to be able to inject suggestions
...
Change-Id: I1061da0edfdb05c64c5711717d4ef9fa9681e568
2012-07-06 19:36:11 +09:00
Jean Chalard
a3dee0d062
Merge "Fix a bug where spaces would be forgotten"
2012-07-06 02:09:28 -07:00
Jean Chalard
4fde56b818
Fix a bug where spaces would be forgotten
...
Bug: 6785706
Change-Id: Ic7bf242ef058d116b986d47ad197b6d2802e2342
2012-07-06 17:51:10 +09:00
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
8e36e5102e
Remove useless processing (A65)
...
We just resetted the composing state - updating suggestions
is sure to yield no results. We may as well not call
updateSuggestions at all.
We should however still cancel any lingering timer from a
previous input field, to avoid this useless processing.
Change-Id: Ic1a19d577903d792bb797c837cc517ea8d430e75
2012-07-06 16:28:42 +09:00
Jean Chalard
449be371ae
Refinement (A64)
...
Change-Id: I7c16e28ffce4fe0965b756bf2b00ee63b77dd039
2012-07-06 16:28:42 +09:00
Jean Chalard
43193ad60f
Remove useless code (A63)
...
If the separator is not a space, then we will always call
setPunctuationSuggestions and reset the suggestion strip anyway.
If the separator is a space, then the cursor has a space on
the left, which means isCursorTouchingWord depends only on
whether it touches a word on the right. If we were displaying
the "add to dictionary hint", it means a suggestion was just
chosen, so it had to be displayed, and that requires a composing
word and no non-separator at the right of the cursor.
In the end, if we go through this postUpdateSuggestions call,
we are sure we will reset the suggestions later in this method,
either by calling postUpdateBigramPredictions, or
setPunctuationSuggestions.
Change-Id: I95d5f77a5d0ac6d1a6ced8d67d6ac8f650db4a32
2012-07-06 16:28:42 +09:00
Jean Chalard
8ba33c1a49
Simplification (A62)
...
Change-Id: I606270a0387787445b7cd6b94e4830bfc144b49e
2012-07-06 16:27:55 +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