aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | am 3d26af83: (-s ours) am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '3d26af838690fddf9227050b18c8b03441b602c1':
| * | | | | | | | | | am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '341f7ea74b30371a464994544244a8e1c0327277':
| | * | | | | | | | | am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce':
| | | * | | | | | | | am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '3a496eb86cf9db788874d1b0e4628a9c3efd1a2d':
| | | | * | | | | | | am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'a2fd9c6cdd094e6a076949129c01ca6d10d6fa24': Import translations. DO NOT MERGE
* | | | | | | | | | | | am b5cac103: (-s ours) am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b5cac10334ebe1640ab39039b6fbcbac818cb75a':
| * | | | | | | | | | | am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '22f10ac4016c6879f55d65b16765440ff9453f58':
| | * | | | | | | | | | am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '7424f8c587fb4802d4b923e9b512f66a28f24c97':
| | | * | | | | | | | | am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '585f624ba50bc34eb2661bf2f6d3e266d1a55acf':
| | | | * | | | | | | | am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '5bc30df7e03f9354a03d9a5f7819cd3bdae18201': Import translations. DO NOT MERGE
* | | | | | | | | | | | | am 01072c69: (-s ours) am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '01072c69f184b0a9c513bdddd0e3f2266e0abe8f':
| * | | | | | | | | | | | am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e':
| | * | | | | | | | | | | am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '6b26d9d4fa6fa1e799beccbafab3278af09bf93d':
| | | * | | | | | | | | | am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '256e2ffddf7e22bdf201c44a880a36e73b8f8fbe':
| | | | * | | | | | | | | am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'cad0777a4bade34d6bedd096eae712e29df99fc1': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | am b3cde203: (-s ours) am bbec724b: (-s ours) am 043af557: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE * commit 'b3cde203fd67230bbbfa1421d265bb211359905c':
| * | | | | | | | | | | | am bbec724b: (-s ours) am 043af557: (-s ours) am f4d53d6f: (-s ours) am ↵Geoff Mendal2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31d085ff: (-s ours) Import translations. DO NOT MERGE * commit 'bbec724b2ae4677685a7300ae4b0c1e820cdf33a':
| | * | | | | | | | | | | am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import ↵Geoff Mendal2015-03-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5':
| | | * | | | | | | | | | am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-260-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4d53d6fdad4335e817c6f71e730b0cf0165de0a':
| | | | * | | | | | | | | am 31d085ff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-260-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | Use the complete Locale in generating the dictionary id.Mohammadinamul Sheik2015-03-252-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also deleted a couple of dead methods. Bug:19929051 Change-Id: I4f88dbc2a8204d5e2a20d1ad8c205a23c6319f8d
* | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-2574-74/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a29d7e960f826153ce0942fd5f4a179775377e3 Auto-generated-cl: translation import
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge "Force download the dictionaries after the apk package is updated."Mohammadinamul Sheik2015-03-2410-17/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Force download the dictionaries after the apk package is updated.Mohammadinamul Sheik2015-03-2410-17/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also display the notification when the dictionaries are auto updated Bug: 19808828 Change-Id: If5c4efb73d8bb554d812afcf7deafec3ac40a462
* | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | 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 823aaf0f: (-s ours) am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow ↵Dan Zivkovic2015-03-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu during setup. DO NOT MERGE * commit '823aaf0f7d90823671fc4aabce6e56145f29921a': Block overflow menu during setup. DO NOT MERGE
| * | | | | | | | | | | | | | | | am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO ↵Dan Zivkovic2015-03-231-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit 'c787bd666330f872e2f3aff0d3f590724f95d574': Block overflow menu during setup. DO NOT MERGE
| | * | | | | | | | | | | | | | | am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGEDan Zivkovic2015-03-231-2/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f09e99d24b4f67ef14d78a18a246da67cca650e': Block overflow menu during setup. DO NOT MERGE
| | | * | | | | | | | | | | | | | am 2bc9f407: Block overflow menu during setup. DO NOT MERGEDan Zivkovic2015-03-231-2/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2bc9f4073d872ac3ffb56e44bef39e24da12a66f': Block overflow menu during setup. DO NOT MERGE
| | | | * | | | | | | | | | | | | Block overflow menu during setup. DO NOT MERGEDan Zivkovic2015-03-231-2/+14
| | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 19866981. Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c (cherry picked from commit 75fc9080a83881e5d8961eb21caa93496a84483e)
* | | | | | | | | | | | | | | | Merge "Disable Hinglish locale."Chieu Nguyen2015-03-243-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Disable Hinglish locale.Chieu Nguyen2015-03-233-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19899126. Change-Id: I1824233b3bcb6cb6579714a7eb375ea2cebc39db
* | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Merge "Reenable next-word suggestion if autocorrection reenabled."Chieu Nguyen2015-03-241-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Reenable next-word suggestion if autocorrection reenabled.Chieu Nguyen2015-03-231-5/+3
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19896768. Change-Id: Ifeb3401612416e58bb362c5250ce0c15fc4b3c45
* | | | | | | | | | | | | | | | | Merge "We can't spell check Russian without an LM."Dan Zivkovic2015-03-242-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | We can't spell check Russian without an LM.Dan Zivkovic2015-03-232-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I635a51acc2e45aebe23a1cf69da1b5c72a6ac9e1
* | | | | | | | | | | | | | | | | am c9e43b1d: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ↵Qiwen Zhao2015-03-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE ANYWHERE. * commit 'c9e43b1dbbefcc5cafea87976e9f6a59163731a0':
| * | | | | | | | | | | | | | | reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c24340f956c16d8594c44d45685f8a814538245b':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1073ef97: am 1bb20aa0: am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1073ef9756617ecd2b4eeddca045039d9e6f3d14':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ead70974: am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the ↵Yohei Yukawa2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full-screen mode * commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key background * commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b':