Jean Chalard
30dd558802
Merge "Pull the "next word prediction" option up a level."
2012-06-25 18:54:28 -07:00
Eric Fischer
31e82e7e0f
am 67727e34: (-s ours) am 04f0b211: Import translations. DO NOT MERGE
...
* commit '67727e34a28e3bfe3f331733b9d1e3c78294e793':
Import translations. DO NOT MERGE
2012-06-25 14:27:19 -07:00
Eric Fischer
67727e34a2
am 04f0b211: Import translations. DO NOT MERGE
...
* commit '04f0b2113d82e755dc0d31a9547fb30d317ceac3':
Import translations. DO NOT MERGE
2012-06-25 14:24:41 -07:00
Eric Fischer
43d9b7818b
Import translations. DO NOT MERGE
...
Change-Id: I8b66b0f81300af586db2db3f653ce3e2882a7efe
2012-06-25 13:47:45 -07:00
Eric Fischer
04f0b2113d
Import translations. DO NOT MERGE
...
Change-Id: Ie741f7f0dccd2aef3ba43ac02776eaac9cb4f9af
2012-06-25 13:44:10 -07:00
Ken Wakasa
9f78eed456
Remove "Key popup dismiss delay" when "Popup on keypress" is suppressed
...
bug: 6714783
Change-Id: Idf674e8e1af80642f2c53f7ae5c03e21c9e04292
2012-06-26 00:40:53 +09:00
Satoshi Kataoka
7368009799
Change JNI for Gesture
...
Change-Id: I774a0052038d16677f60f7efa11fd266cb5f3088
2012-06-25 18:54:37 +09:00
Jean Chalard
5a73d72265
Merge "Refactoring and groundwork to fix a bug with older apps"
2012-06-25 00:42:21 -07:00
Jean Chalard
c3ebf1a43a
Refactoring and groundwork to fix a bug with older apps
...
This has a good, although small, impact on performance : it removes
a two-way IPC call in a most frequent case, while possibly adding
one in a rather unfrequent and less critical case.
Also, this fixes a bug with surrogate pairs. This specific branch
of code now correctly handles surrogate pairs.
Aside from this, it should have no impact on behavior.
However, since it does delay access to the previous character in
the text view by a two-way IPC call, it actually goes a long way
toward fixing bug#6668226. It is not really a fix and the race
condition still exists, but this change makes it much, much
harder to hit.
Bug: 6668226
Change-Id: Id11cc6a0b7488d6bd392227cafdcf3a8d4c62f6c
2012-06-25 16:32:25 +09:00
Jean Chalard
a316a15984
Merge "Tentatively remove a dependency on WordCallback (A3)"
2012-06-24 23:08:13 -07:00
Jean Chalard
dc01bd5ea4
Merge "Improve compatibility for ICS."
2012-06-24 20:41:19 -07:00
Jean Chalard
e9e51cab78
Pull the "next word prediction" option up a level.
...
Bug: 6694141
Change-Id: Ib01575b0994e69ef232a234c575242ec49ed0679
2012-06-25 12:15:21 +09:00
The Android Open Source Project
223b8b44df
am 216c29ec: Reconcile with jb-release
...
* commit '216c29ec51de9616264a1e9ee3dd5ac840701d03':
2012-06-22 08:20:22 -07:00
The Android Open Source Project
216c29ec51
Reconcile with jb-release
...
Change-Id: Ic79723ed73516cae44dc9f6d1f1a1b2cc4f461bc
2012-06-22 08:17:22 -07:00
Satoshi Kataoka
2cf265b345
Merge "Fix possible NPE from a concurrent problem in LatinIME"
2012-06-21 22:16:48 -07:00
Kurt Partridge
e6a39d5677
Merge "Allow punctuation through privacy filter"
2012-06-21 21:53:48 -07:00
The Android Automerger
2c206fd85b
merge in jb-release history after reset to jb-dev
2012-06-21 17:53:02 -07:00
Eric Fischer
c0317ea39f
am f3e54e10: (-s ours) am f44adb18: Import translations. DO NOT MERGE
...
* commit 'f3e54e100687a1c7d33ce98acc248aa553e03d1d':
Import translations. DO NOT MERGE
2012-06-21 17:01:57 -07:00
Eric Fischer
f3e54e1006
am f44adb18: Import translations. DO NOT MERGE
...
* commit 'f44adb1845eba429f350e91b1d2adb5126947baf':
Import translations. DO NOT MERGE
2012-06-21 16:59:54 -07:00
Eric Fischer
142d6bb377
Import translations. DO NOT MERGE
...
Change-Id: Ida61fe3b2464868d3bb6d4b42032273edbf39689
2012-06-21 16:07:47 -07:00
Eric Fischer
f44adb1845
Import translations. DO NOT MERGE
...
Change-Id: If472b6e3c80691ad057990f7c6e2710fc8758e2a
2012-06-21 16:04:00 -07:00
Kurt Partridge
33d9f9b6db
Allow punctuation through privacy filter
...
Also cleaned up the privacy code a bit.
multi-project commit with Change-Id: Ic0919a6929ebb2623ff4124f7adc96d9e5f8df3c
Bug: 6188932
Change-Id: Id470fe7cc6e4a8fb01f1ea5b178a74cd27d59218
2012-06-21 00:17:48 -07:00
Jean Chalard
1b71ff00a2
Merge "Update an outdated comment"
2012-06-20 20:18:51 -07:00
Jean Chalard
9997b44846
Improve compatibility for ICS.
...
ICS didn't have a SHORTCUT column in the user dictionary.
If running on a build under JellyBean, we should not ask
for it lest we crash.
Bug: 6600617
Change-Id: Iac0cbcc63c10064f01e2d51eec5931fd9cdd0922
2012-06-20 18:43:56 -07:00
Jean Chalard
83f4a9866a
Cleanup, part 10 : remove from the code obsolete options (C10)
...
Change-Id: Id0806ad3dc7ccb632713eebaca76f0bab26ece5d
2012-06-21 10:07:05 +09:00
Jean Chalard
7c406ed655
Tentatively remove a dependency on WordCallback (A3)
...
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: Id5a59eaec2aeefa0ba4524420a8e035d383f6545
2012-06-21 10:03:44 +09:00
Jean Chalard
e8bb8351d6
Cleanup, part 9 (C9)
...
Change-Id: Ifb15553824915d0634aea83689302c2418b093f3
2012-06-21 09:22:32 +09:00
Ying Wang
ecc6430155
Merge "Import translations. DO NOT MERGE"
2012-06-20 15:31:36 -07:00
Ying Wang
44b459c910
Import translations. DO NOT MERGE
...
Change-Id: Ic9cd1c250611e5b25604d55d4115391068052f36
2012-06-20 14:59:06 -07: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
0e8b1db948
Merge "Cleanup, part 6 (C6)"
2012-06-19 09:25:33 -07: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
Jean Chalard
b821b72aa1
Merge "Remove a member (B5)"
2012-06-19 09:15:57 -07:00
The Android Open Source Project
b0d61cb951
am e2106796: Reconcile with jb-release
...
* commit 'e2106796e91d618f7c77d338302ab4e87c20e132':
2012-06-19 07:20:46 -07:00
The Android Open Source Project
e2106796e9
Reconcile with jb-release
...
Change-Id: Ibde708a3b56604dea5f6eb4699519c0981b04aeb
2012-06-19 07:16:04 -07:00
The Android Automerger
ad1d7a53a2
merge in jb-release history after reset to jb-dev
2012-06-19 07:05:44 -07:00
The Android Open Source Project
22e4e7622e
am 899b3cb7: Reconcile with jb-release
...
* commit '899b3cb7b3c48d388a36d8af42847ecb973bf092':
Fix UserHistoryBigram data contention in UserHistoryDictionary
2012-06-19 06:19:45 -07:00
The Android Open Source Project
899b3cb7b3
Reconcile with jb-release
...
Change-Id: Ie0250595352401f59f3e5b32b6121b184102d327
2012-06-19 06:13:56 -07:00
Tadashi G. Takaoka
563b48a976
am 8ce23247: am cc2f8c27: Merge "Shorten the key typing timeout parameter to 350ms" into jb-dev
...
* commit '8ce23247aefdab60dc6b555a82a563018c766ea8':
Shorten the key typing timeout parameter to 350ms
2012-06-18 18:23:51 -07:00
Tadashi G. Takaoka
8ce23247ae
am cc2f8c27: Merge "Shorten the key typing timeout parameter to 350ms" into jb-dev
...
* commit 'cc2f8c27d997c79f03c574c6a1c049093409f94e':
Shorten the key typing timeout parameter to 350ms
2012-06-18 18:21:35 -07:00
Tadashi G. Takaoka
cc2f8c27d9
Merge "Shorten the key typing timeout parameter to 350ms" into jb-dev
2012-06-18 18:18:33 -07:00
Tadashi G. Takaoka
c50686bff5
Shorten the key typing timeout parameter to 350ms
...
Bug: 6688921
Change-Id: Ia6d6d98577769a3ce6a39873559993229156f2b8
2012-06-18 17:38:33 -07:00
Jean Chalard
ba6bc24e62
am 50152821: am a1425660: Merge "Make sure whitelist targets are in the main dictionary" into jb-dev
...
* commit '501528218da3b3043eab83201928518bf7cdc2ce':
Make sure whitelist targets are in the main dictionary
2012-06-18 17:08:14 -07:00
Jean Chalard
501528218d
am a1425660: Merge "Make sure whitelist targets are in the main dictionary" into jb-dev
...
* commit 'a1425660c54e3f1e34d2e7bafc06564c29107729':
Make sure whitelist targets are in the main dictionary
2012-06-18 17:06:12 -07:00
Jean Chalard
a1425660c5
Merge "Make sure whitelist targets are in the main dictionary" into jb-dev
2012-06-18 17:04:35 -07:00
Ying Wang
a957b7c5e1
Merge "Import translations. DO NOT MERGE"
2012-06-18 16:38:26 -07:00
Ying Wang
70c6db3c93
am 5e50c97a: (-s ours) am d7cedda9: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '5e50c97a7564661e7861c4fbf2a7770112056ee0':
Import translations. DO NOT MERGE
2012-06-18 15:46:25 -07:00
Ying Wang
27b9194d3e
Import translations. DO NOT MERGE
...
Change-Id: I1f989dc6fc44d4e5a7632630fc2717d6a51b9eb8
2012-06-18 15:44:53 -07:00