aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | am f3e54e10: (-s ours) am f44adb18: Import translations. DO NOT MERGEEric Fischer2012-06-210-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'f3e54e100687a1c7d33ce98acc248aa553e03d1d': Import translations. DO NOT MERGE
| * | | | | | | am f44adb18: Import translations. DO NOT MERGEEric Fischer2012-06-211-2/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'f44adb1845eba429f350e91b1d2adb5126947baf': Import translations. DO NOT MERGE
| | * | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If472b6e3c80691ad057990f7c6e2710fc8758e2a
* | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ida61fe3b2464868d3bb6d4b42032273edbf39689
* | | | | | | | Merge "Update an outdated comment"Jean Chalard2012-06-201-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update an outdated commentJean Chalard2012-06-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d02dc8597ed14d998caeaa056813353e2d7ec1a
* | | | | | | | | Cleanup, part 10 : remove from the code obsolete options (C10)Jean Chalard2012-06-214-38/+4
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id0806ad3dc7ccb632713eebaca76f0bab26ece5d
* | | | | | | | Cleanup, part 9 (C9)Jean Chalard2012-06-212-11/+3
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb15553824915d0634aea83689302c2418b093f3
* | | | | | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-06-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEYing Wang2012-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic9cd1c250611e5b25604d55d4115391068052f36
* | | | | | | | Cleanup, part 8 (C8)Jean Chalard2012-06-202-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iecc9b3d43c191614c2951408e14085cb77eefd4d
* | | | | | | | Cleanup, part 7 (C7)Jean Chalard2012-06-202-15/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I662be9d3b31fb9e157722f38cab1e6fb8a1152ab
* | | | | | | Merge "Cleanup, part 6 (C6)"Jean Chalard2012-06-191-8/+0
|\ \ \ \ \ \ \
| * | | | | | | Cleanup, part 6 (C6)Jean Chalard2012-06-161-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I184f3a336278559df255c5d600a98fbba468a243
* | | | | | | | Merge "Cleanup, part 4 (C4)"Jean Chalard2012-06-193-8/+18
|\| | | | | | |
| * | | | | | | Cleanup, part 4 (C4)Jean Chalard2012-06-163-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2821ae71ec49e4b6b512157d17b80198f74321e4
* | | | | | | | Merge "Cleanup, part 3 (C3)"Jean Chalard2012-06-193-8/+7
|\| | | | | | |
| * | | | | | | Cleanup, part 3 (C3)Jean Chalard2012-06-163-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0be8dc26b6fa366a3dabeea940d466602073244
* | | | | | | | Merge "Remove a member (B5)"Jean Chalard2012-06-192-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove a member (B5)Jean Chalard2012-06-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new call in the test ensures getCurrentInputEditorInfo actually works. Change-Id: I2ee407bd9927d22db537d12f339e2b977a38054a
* | | | | | | | | am e2106796: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | * commit 'e2106796e91d618f7c77d338302ab4e87c20e132':
| * | | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | Change-Id: Ibde708a3b56604dea5f6eb4699519c0981b04aeb
| | * | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | am 899b3cb7: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '899b3cb7b3c48d388a36d8af42847ecb973bf092': Fix UserHistoryBigram data contention in UserHistoryDictionary
| * | | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Change-Id: Ie0250595352401f59f3e5b32b6121b184102d327
| | * | | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-180-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-160-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Fix UserHistoryBigram data contention in UserHistoryDictionarysatok2012-06-121-189/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6637614 Change-Id: I34d26563e59d3b09bf35b8173dac5645ccb6a39f
* | | | | | | | | | | | | | am 8ce23247: am cc2f8c27: Merge "Shorten the key typing timeout parameter to ↵Tadashi G. Takaoka2012-06-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 350ms" into jb-dev * commit '8ce23247aefdab60dc6b555a82a563018c766ea8': Shorten the key typing timeout parameter to 350ms
| * | | | | | | | | | | | | am cc2f8c27: Merge "Shorten the key typing timeout parameter to 350ms" into ↵Tadashi G. Takaoka2012-06-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'cc2f8c27d997c79f03c574c6a1c049093409f94e': Shorten the key typing timeout parameter to 350ms
| | * | | | | | | | | | | | Merge "Shorten the key typing timeout parameter to 350ms" into jb-devTadashi G. Takaoka2012-06-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Shorten the key typing timeout parameter to 350msTadashi G. Takaoka2012-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6688921 Change-Id: Ia6d6d98577769a3ce6a39873559993229156f2b8
* | | | | | | | | | | | | | | am 50152821: am a1425660: Merge "Make sure whitelist targets are in the main ↵Jean Chalard2012-06-184-3/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary" into jb-dev * commit '501528218da3b3043eab83201928518bf7cdc2ce': Make sure whitelist targets are in the main dictionary
| * | | | | | | | | | | | | | am a1425660: Merge "Make sure whitelist targets are in the main dictionary" ↵Jean Chalard2012-06-184-3/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'a1425660c54e3f1e34d2e7bafc06564c29107729': Make sure whitelist targets are in the main dictionary
| | * | | | | | | | | | | | | Merge "Make sure whitelist targets are in the main dictionary" into jb-devJean Chalard2012-06-184-3/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Make sure whitelist targets are in the main dictionaryJean Chalard2012-06-194-3/+24
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6680976 Change-Id: Ieddb5eecb813da3a8a515930568e356bc3526386
* | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-06-183-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Import translations. DO NOT MERGEYing Wang2012-06-183-6/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f989dc6fc44d4e5a7632630fc2717d6a51b9eb8
* | | | | | | | | | | | | | am 5e50c97a: (-s ours) am d7cedda9: Merge "Import translations. DO NOT ↵Ying Wang2012-06-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-dev * commit '5e50c97a7564661e7861c4fbf2a7770112056ee0': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | am d7cedda9: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-182-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7cedda932f90eafed17f8009d939923b7747fce': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-182-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Import translations. DO NOT MERGEYing Wang2012-06-182-5/+5
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I151800deab6dc7754d4671e860585dec1b057472
* | | | | | | | | | | | | | am e6730ac0: am 5e4df66f: Merge "Removing implementation of unnecessary APIs ↵Svetoslav Ganov2012-06-181-5/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | taken out of the support lib." into jb-dev * commit 'e6730ac0e89de1cd81b92412751ec3950d8befb4': Removing implementation of unnecessary APIs taken out of the support lib.
| * | | | | | | | | | | | | am 5e4df66f: Merge "Removing implementation of unnecessary APIs taken out of ↵Svetoslav Ganov2012-06-181-5/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the support lib." into jb-dev * commit '5e4df66fcecde643fdf94ff9dafb33042cc1d242': Removing implementation of unnecessary APIs taken out of the support lib.
| | * | | | | | | | | | | | Merge "Removing implementation of unnecessary APIs taken out of the support ↵Svetoslav Ganov2012-06-181-5/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lib." into jb-dev
| | | * | | | | | | | | | | | Removing implementation of unnecessary APIs taken out of the support lib.Svetoslav Ganov2012-06-171-5/+0
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We have hidden a framework API and it was take out of the support lib. This API is not necessary and this patch removes the implementation in LatinIME. bug:6675330 Change-Id: I18aff7a6c7bc2b76c7332abe0bf294fbbb99ccfc
* | | | | | | | | | | | | | Merge "Simplification (B4)"Jean Chalard2012-06-181-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |