aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge "Check for accounts when enabling sync features."Jatin Matani2015-03-241-1/+8
| |\
| | * Check for accounts when enabling sync features.Jatin Matani2015-03-241-2/+9
| | | | | | | | | | | | | | | Bug:19895917 Change-Id: I2f2f535f5a5c17c5642a5c44d2fd20a520ccfd73
* | | am 600cca16: Merge "Force download the dictionaries after the apk package is ↵Mohammadinamul Sheik2015-03-249-17/+93
|\| | | | | | | | | | | | | | | | | | | | updated." * commit '600cca16cbd34cda966fd47bc822a673aee3788a': Force download the dictionaries after the apk package is updated.
| * | Merge "Force download the dictionaries after the apk package is updated."Mohammadinamul Sheik2015-03-249-17/+93
| |\ \
| | * | Force download the dictionaries after the apk package is updated.Mohammadinamul Sheik2015-03-249-17/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also display the notification when the dictionaries are auto updated Bug: 19808828 Change-Id: If5c4efb73d8bb554d812afcf7deafec3ac40a462
* | | | am 3b0c2eb0: Merge "Avoid NPE when logging the entry point to Settings"Jatin Matani2015-03-241-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94': Avoid NPE when logging the entry point to Settings
| * | | Merge "Avoid NPE when logging the entry point to Settings"Jatin Matani2015-03-241-1/+1
| |\ \ \
| | * | | Avoid NPE when logging the entry point to SettingsJatin Matani2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The populator class that serializes the proto uses a switch and throws an NPE. Bug:19911288 Change-Id: Id0fa371b3c64e706e14a13bb6e643406f94be035
* | | | | am a8b14a4f: Merge "Change DictionaryStats to report content version."Dan Zivkovic2015-03-244-41/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8b14a4fdd544d20c08e9cae8b8a094f248b1728': Change DictionaryStats to report content version.
| * | | | Merge "Change DictionaryStats to report content version."Dan Zivkovic2015-03-244-41/+53
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Change DictionaryStats to report content version.Dan Zivkovic2015-03-244-41/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 19908719. Change-Id: I5a00b5277e9cd7d964b53ff5823bada21be110fa
| * | | | Merge "DO NOT MERGE. Do not access metadatadb from main thread."Ulas Kirazci2015-03-241-20/+44
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | DO NOT MERGE. Do not access metadatadb from main thread.Ulas Kirazci2015-03-201-20/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix Refresh button replicating itself on orientation change. Bug: 19786650 Change-Id: I19a964d69d9141ba6515bbe19a120d4685628fe3
* | | | | am 37cb7a73: Merge "Disable Hinglish locale."Chieu Nguyen2015-03-241-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '37cb7a7371fbd0bcb1095b6975ec875f7e28cda4': Disable Hinglish locale.
| * | | | Merge "Disable Hinglish locale."Chieu Nguyen2015-03-241-0/+2
| |\ \ \ \
| | * | | | Disable Hinglish locale.Chieu Nguyen2015-03-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19899126. Change-Id: I1824233b3bcb6cb6579714a7eb375ea2cebc39db
* | | | | | am f74005d8: Remove dependency in correction settings.Chieu Nguyen2015-03-241-13/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f74005d888febc12ffcde04d230c8f5591b55a95': Remove dependency in correction settings.
| * | | | | Remove dependency in correction settings.Chieu Nguyen2015-03-231-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autocorrection and next-word suggestion are independent, but the settings UI creates a dependency. Bug: 19896768. Change-Id: Ibcdd497cdfd7b9c3a69c61e0c2d116d67df84ef8
* | | | | | am fac1f631: Merge "Reenable next-word suggestion if autocorrection reenabled."Chieu Nguyen2015-03-241-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fac1f631b96c4ab852be950c03ef3d57faa86b28': Reenable next-word suggestion if autocorrection reenabled.
| * | | | | Reenable next-word suggestion if autocorrection reenabled.Chieu Nguyen2015-03-231-5/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 19896768. Change-Id: Ifeb3401612416e58bb362c5250ce0c15fc4b3c45
* | | | | am fa296fa6: Merge "Move ManagedProfileUtils to overridable"Jatin Matani2015-03-232-83/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa296fa625dcd67e17520c264ed506bb4728e487': Move ManagedProfileUtils to overridable
| * | | | Merge "Move ManagedProfileUtils to overridable"Jatin Matani2015-03-232-83/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Move ManagedProfileUtils to overridableJatin Matani2015-03-232-83/+1
| | | |/ | | |/| | | | | | | | | | | | | Bug:19532354 Change-Id: I50b3ae11b6e58f07b482353b624b1a7a73eadc99
* | | | am e02d4831: Merge "Block overflow menu during setup."Dan Zivkovic2015-03-231-2/+14
|\| | | | | | | | | | | | | | | | | | | * commit 'e02d4831872e6547af51ce4ef46049281874e324': Block overflow menu during setup.
| * | | Merge "Block overflow menu during setup."Dan Zivkovic2015-03-231-2/+14
| |\ \ \
| | * | | Block overflow menu during setup.Dan Zivkovic2015-03-231-2/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug 19866981. Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
* | | | am bc1cf081: Merge "Fix some i18n messaging"Jatin Matani2015-03-231-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'bc1cf0817bddceb5dfab81f9ff030fe10eb4a1bc': Fix some i18n messaging
| * | | Merge "Fix some i18n messaging"Jatin Matani2015-03-231-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix some i18n messagingJatin Matani2015-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug:19538786 Bug:19542029 Change-Id: Ifc06064308f899527283378dda0c44223df7e9e9
| * | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-211-0/+207
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff35b6266f1f7249bd4a506f6667fef40eddb530 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-211-0/+90
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+90
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8ca67d58e6b3e6325da4f3711aa9dc3a7a1c355 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-211-0/+208
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+208
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I4ab87513a95932a4c68ee21002a4784d8d577d68 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-211-0/+851
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+851
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Id1e2004e85354dbc48b0bd4104ebc1cf8439161c Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-211-0/+24
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+24
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I256ea01e4447fdf2b485d53706b5e69b50a592a3 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-211-0/+27
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+27
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf4c8f681d36736a7e7b1c1568cb688bd15d09bd Auto-generated-cl: translation import
| * / / / Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+31
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I838ad0471c73777e92031acd2713a95378de4535 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2015-03-211-0/+207
|\ \ \ \
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iceddc06da30422e4a98df45fe01e2e90a4335375 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+90
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ie7d8b90ea570a58da67395ed31567daa284739c3 Auto-generated-cl: translation import
* | | | am c15bbb52: Retire Delight2 migration code to speed up tests.Dan Zivkovic2015-03-202-5/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'c15bbb52a37be751fed2ba7e765dfd7727306308': Retire Delight2 migration code to speed up tests.
| * | | Retire Delight2 migration code to speed up tests.Dan Zivkovic2015-03-202-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're waiting 10 minutes for tests to run, and half of that time is spent in depreacted code related to migration of Delight2 dictionary files. LatinIME will never migrate another Delight2 dictionary file again, so we can delete this code. Change-Id: I05c7d8429e8d9a26139456763c77997340fea8c2
* | | | am fe716f0f: Resolve some InputLogic todo comments.Dan Zivkovic2015-03-202-34/+6
|\| | | | | | | | | | | | | | | | | | | * commit 'fe716f0f73ee551ce42b523983f92efccce79dc8': Resolve some InputLogic todo comments.
| * | | Resolve some InputLogic todo comments.Dan Zivkovic2015-03-202-34/+6
| | | | | | | | | | | | | | | | Change-Id: Ic3d7d11ad90cc09edf62f48aa5362e71d692f7dd
* | | | am 5cf457c9: Remove external dictionary debug UI.Dan Zivkovic2015-03-204-215/+0
|\| | | | | | | | | | | | | | | | | | | * commit '5cf457c976d69e05e3d93df0363f7a411b131bf9': Remove external dictionary debug UI.