aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Simplification (B4)Jean Chalard2012-06-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5abf722a533980ed2d89381dbddc0a71b6f5b6b
| * | | | | | | | | | | | | | Merge "Move a settings method to SettingsValues (B3)"Jean Chalard2012-06-182-18/+16
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Move a settings method to SettingsValues (B3)Jean Chalard2012-06-192-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibfa27bd919c92be219c4d107b3ace008ca80a19f
| * | | | | | | | | | | | | | am e4bbff78: am 38dc9ca3: Fix duplicate period on Persian tablet keyboardTadashi G. Takaoka2012-06-187-13/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4bbff783bddb70f52402454987ede281fb86039': Fix duplicate period on Persian tablet keyboard
| | * | | | | | | | | | | | | am 38dc9ca3: Fix duplicate period on Persian tablet keyboardTadashi G. Takaoka2012-06-187-13/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38dc9ca31432f19641d80cd6f89354d66c5bebc1': Fix duplicate period on Persian tablet keyboard
| | | * | | | | | | | | | | | Fix duplicate period on Persian tablet keyboardTadashi G. Takaoka2012-06-187-13/+30
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6679579 Change-Id: I8bccbfbdf7ea1fa1b78a5af05eb1df100f22ab0c
| * | | | | | | | | | | | | am 58f9b35e: am 6de1b7a7: Fix Persian keyboard having correct code pointsTadashi G. Takaoka2012-06-1811-73/+157
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58f9b35e1cf5a975ec1312858aad9b5cc307fda8': Fix Persian keyboard having correct code points
| | * | | | | | | | | | | | am 6de1b7a7: Fix Persian keyboard having correct code pointsTadashi G. Takaoka2012-06-1811-73/+157
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6de1b7a70986ebb1bf63078617d59ec4e46b657f': Fix Persian keyboard having correct code points
| | | * | | | | | | | | | | Fix Persian keyboard having correct code pointsTadashi G. Takaoka2012-06-1611-73/+157
| | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6679850 Change-Id: Iaa33f48ffb5634de31e039574fb58185c6c078e8
| * | | | | | | | | | | | am 2c94d797: (-s ours) am e59ed199: Merge "Import translations. DO NOT ↵Ying Wang2012-06-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-dev * commit '2c94d7974e8bdcae01f421874ab952f462449b53': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am e59ed199: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-181-5/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e59ed19988c5904298bdaaff018e2a0ccaa0db44': Import translations. DO NOT MERGE
| | | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-151-5/+5
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Import translations. DO NOT MERGEYing Wang2012-06-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b150bb52f23fbbf138dd3c3ae51a12b5fd79f57
| * | | | | | | | | | | | | am a0c28d2d: am d41ee40b: Merge "Update dictionaries." into jb-devJean Chalard2012-06-1811-329/+188
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0c28d2d3805ba2358fdb6b928e8934810e4d483': Update dictionaries.
| | * | | | | | | | | | | | am d41ee40b: Merge "Update dictionaries." into jb-devJean Chalard2012-06-1811-329/+188
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd41ee40b3355c689f1da679d0de6a6a8d222cb1f': Update dictionaries.
| | | * | | | | | | | | | | Merge "Update dictionaries." into jb-devJean Chalard2012-06-1511-329/+188
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Update dictionaries.Jean Chalard2012-06-1611-329/+188
| | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - English dict scrubbed for distractors - EN, FR, IT, DE include improvements from user feedback Bug: 6394369 Change-Id: I9af5415d0b6a5edfea2956657b0fee7906ebb344
| * | | | / / / / / / / / / am 866cfd3a: am fa447071: Merge "Update LatinIME due to hidden APIs taken ↵Svetoslav Ganov2012-06-181-6/+0
| |\| | | | | | | | | | | | | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out of the support lib." into jb-dev * commit '866cfd3a68c370bedc4deb3d40ff4ff7c44902bd': Update LatinIME due to hidden APIs taken out of the support lib.
| | * | | | | | | | | | | am fa447071: Merge "Update LatinIME due to hidden APIs taken out of the ↵Svetoslav Ganov2012-06-181-6/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support lib." into jb-dev * commit 'fa447071df308925d0f901391dc7d422ec5f1f59': Update LatinIME due to hidden APIs taken out of the support lib.
| | | * | | | | | | | | | Merge "Update LatinIME due to hidden APIs taken out of the support lib." ↵Svetoslav Ganov2012-06-151-6/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | into jb-dev
| | | | * | | | | | | | | Update LatinIME due to hidden APIs taken out of the support lib.Svetoslav Ganov2012-06-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We have hidden the APIs for accessiiblity focus search since it wull be perfomred by the client, updated the support lib, and now we are updating the LatinIME. bug:6675330 Change-Id: I9dd3450b40148be7ce750f6bffc0a047a541982f
| * | | | | | | | | | | | Merge "Make a variable final (A2)"Jean Chalard2012-06-181-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \