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
Ying Wang
5e50c97a75
am d7cedda9: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'd7cedda932f90eafed17f8009d939923b7747fce':
Import translations. DO NOT MERGE
2012-06-18 15:44:09 -07:00
Ying Wang
d7cedda932
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-18 15:42:04 -07:00
Ying Wang
7d5c9c700b
Import translations. DO NOT MERGE
...
Change-Id: I151800deab6dc7754d4671e860585dec1b057472
2012-06-18 15:40:28 -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
Svetoslav Ganov
808ba7b8f8
am e6730ac0: am 5e4df66f: Merge "Removing implementation of unnecessary APIs taken out of the support lib." into jb-dev
...
* commit 'e6730ac0e89de1cd81b92412751ec3950d8befb4':
Removing implementation of unnecessary APIs taken out of the support lib.
2012-06-18 11:31:43 -07:00
Svetoslav Ganov
e6730ac0e8
am 5e4df66f: Merge "Removing implementation of unnecessary APIs taken out of the support lib." into jb-dev
...
* commit '5e4df66fcecde643fdf94ff9dafb33042cc1d242':
Removing implementation of unnecessary APIs taken out of the support lib.
2012-06-18 11:30:11 -07:00
Svetoslav Ganov
5e4df66fce
Merge "Removing implementation of unnecessary APIs taken out of the support lib." into jb-dev
2012-06-18 11:28:04 -07: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
56523ce0bf
Merge "Simplification (B4)"
2012-06-18 10:55:59 -07:00
Jean Chalard
64e52051cf
Simplification (B4)
...
Change-Id: Id5abf722a533980ed2d89381dbddc0a71b6f5b6b
2012-06-19 02:54:13 +09:00
Jean Chalard
5a1259523f
Merge "Move a settings method to SettingsValues (B3)"
2012-06-18 10:53:47 -07:00
Tadashi G. Takaoka
a5bbb8df75
am e4bbff78: am 38dc9ca3: Fix duplicate period on Persian tablet keyboard
...
* commit 'e4bbff783bddb70f52402454987ede281fb86039':
Fix duplicate period on Persian tablet keyboard
2012-06-18 10:52:54 -07:00
Tadashi G. Takaoka
794a9c913a
am 58f9b35e: am 6de1b7a7: Fix Persian keyboard having correct code points
...
* commit '58f9b35e1cf5a975ec1312858aad9b5cc307fda8':
Fix Persian keyboard having correct code points
2012-06-18 10:52:46 -07:00
Ying Wang
6e2b329705
am 2c94d797: (-s ours) am e59ed199: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '2c94d7974e8bdcae01f421874ab952f462449b53':
Import translations. DO NOT MERGE
2012-06-18 10:52:45 -07:00
