043af5575e
am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f4d53d6fdad4335e817c6f71e730b0cf0165de0a':
2015-03-26 21:00:31 +00:00
f5c7b5a9f6
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-03-26 19:00:26 +00:00
e397cbe2df
am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'ca58fb9c0bbe31f8d626c0c2dab39569b6a03d5a':
Import translations. DO NOT MERGE
2015-03-26 18:56:21 +00:00
92aaaa88d3
am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '9206174e6ba94bb2b11871c983c74989684ecf4f':
Import translations. DO NOT MERGE
2015-03-26 18:56:18 +00:00
013b37a7e9
am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a9431f676d472cb6b103f9d99e9c64de7d161f57':
Import translations. DO NOT MERGE
2015-03-26 18:56:15 +00:00
3a496eb86c
am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a2fd9c6cdd094e6a076949129c01ca6d10d6fa24':
Import translations. DO NOT MERGE
2015-03-26 18:56:12 +00:00
585f624ba5
am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '5bc30df7e03f9354a03d9a5f7819cd3bdae18201':
Import translations. DO NOT MERGE
2015-03-26 18:56:08 +00:00
256e2ffddf
am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'cad0777a4bade34d6bedd096eae712e29df99fc1':
Import translations. DO NOT MERGE
2015-03-26 18:55:58 +00:00
f4d53d6fda
am 31d085ff: (-s ours) Import translations. DO NOT MERGE
...
* commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc':
Import translations. DO NOT MERGE
2015-03-26 18:55:57 +00:00
f24e19741f
am 8f526c9a: Use the complete Locale in generating the dictionary id.
...
* commit '8f526c9a55e0b30f81dcca07dc4f5f4fd341bdb1':
Use the complete Locale in generating the dictionary id.
2015-03-26 03:44:23 +00:00
8f526c9a55
Use the complete Locale in generating the dictionary id.
...
- Also deleted a couple of dead methods.
Bug:19929051
Change-Id: I4f88dbc2a8204d5e2a20d1ad8c205a23c6319f8d
2015-03-25 16:45:56 -07:00
af295fcd7f
am 622093dd: (-s ours) Import translations. DO NOT MERGE
...
* commit '622093dd3a33c711f107424d152d02fe2e4adf14':
Import translations. DO NOT MERGE
2015-03-25 13:42:53 +00:00
d858dbce9a
Import translations. DO NOT MERGE
...
Change-Id: Icf917a7c5cfef90668c1a3646c8faa436cdb4eeb
Auto-generated-cl: translation import
2015-03-25 06:36:28 -07:00
622093dd3a
Import translations. DO NOT MERGE
...
Change-Id: I8a29d7e960f826153ce0942fd5f4a179775377e3
Auto-generated-cl: translation import
2015-03-25 06:32:16 -07:00
6fd178a6f0
Import translations. DO NOT MERGE
...
Change-Id: I22ca6baef73303e5ff28b0503fefe050eefd10a1
Auto-generated-cl: translation import
2015-03-25 06:27:07 -07:00
e8b86f47a8
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-03-25 00:40:32 +00:00
059c335f4e
am 3b175a0b: Merge "Check for accounts when enabling sync features."
...
* commit '3b175a0b5d1355ed8f220cd39e5b74e9ee565371':
Check for accounts when enabling sync features.
2015-03-24 23:43:48 +00:00
3b175a0b5d
Merge "Check for accounts when enabling sync features."
2015-03-24 23:38:01 +00:00
9cea85f178
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-03-24 23:34:30 +00:00
e74be8de58
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-03-24 22:46:40 +00:00
442e519077
am 600cca16: Merge "Force download the dictionaries after the apk package is updated."
...
* commit '600cca16cbd34cda966fd47bc822a673aee3788a':
Force download the dictionaries after the apk package is updated.
2015-03-24 22:38:52 +00:00
bb2773176f
Check for accounts when enabling sync features.
...
Bug:19895917
Change-Id: I2f2f535f5a5c17c5642a5c44d2fd20a520ccfd73
2015-03-24 15:37:11 -07:00
600cca16cb
Merge "Force download the dictionaries after the apk package is updated."
2015-03-24 22:20:46 +00:00
3bc3bc7971
Force download the dictionaries after the apk package is updated.
...
- Also display the notification when the dictionaries are auto updated
Bug: 19808828
Change-Id: If5c4efb73d8bb554d812afcf7deafec3ac40a462
2015-03-24 14:56:54 -07:00
9393497cf5
am 3b0c2eb0: Merge "Avoid NPE when logging the entry point to Settings"
...
* commit '3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94':
Avoid NPE when logging the entry point to Settings
2015-03-24 20:02:45 +00:00
3b0c2eb09f
Merge "Avoid NPE when logging the entry point to Settings"
2015-03-24 19:57:08 +00:00
949fadc9da
am a8b14a4f: Merge "Change DictionaryStats to report content version."
...
* commit 'a8b14a4fdd544d20c08e9cae8b8a094f248b1728':
Change DictionaryStats to report content version.
2015-03-24 19:25:25 +00:00
2fb8e5eecf
Avoid NPE when logging the entry point to Settings
...
The populator class that serializes the proto uses a switch
and throws an NPE.
Bug:19911288
Change-Id: Id0fa371b3c64e706e14a13bb6e643406f94be035
2015-03-24 12:25:22 -07:00
a8b14a4fdd
Merge "Change DictionaryStats to report content version."
2015-03-24 19:20:27 +00:00
4fbbc4fdf8
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-03-24 19:00:38 +00:00
58f83f8ed7
am e1b91d41: (-s ours) Merge "DO NOT MERGE. Do not access metadatadb from main thread."
...
* commit 'e1b91d4138b4f5b7e83d09d506e0be4a6b78467b':
DO NOT MERGE. Do not access metadatadb from main thread.
2015-03-24 18:32:33 +00:00
e1b91d4138
Merge "DO NOT MERGE. Do not access metadatadb from main thread."
2015-03-24 18:28:53 +00:00
72278d3047
Change DictionaryStats to report content version.
...
Bug 19908719.
Change-Id: I5a00b5277e9cd7d964b53ff5823bada21be110fa
2015-03-24 11:19:34 -07:00
be4737900a
am 3b6dc20e: (-s ours) am 823aaf0f: (-s ours) am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
...
* commit '3b6dc20ed8010a720e71d86c1ae6079ade98b664':
Block overflow menu during setup. DO NOT MERGE
2015-03-24 03:34:29 +00:00
3b6dc20ed8
am 823aaf0f: (-s ours) am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
...
* commit '823aaf0f7d90823671fc4aabce6e56145f29921a':
Block overflow menu during setup. DO NOT MERGE
2015-03-24 03:25:17 +00:00
0880e4143a
am 37cb7a73: Merge "Disable Hinglish locale."
...
* commit '37cb7a7371fbd0bcb1095b6975ec875f7e28cda4':
Disable Hinglish locale.
2015-03-24 01:39:12 +00:00
37cb7a7371
Merge "Disable Hinglish locale."
2015-03-24 01:34:02 +00:00
b84617af20
am f74005d8: Remove dependency in correction settings.
...
* commit 'f74005d888febc12ffcde04d230c8f5591b55a95':
Remove dependency in correction settings.
2015-03-24 01:19:55 +00:00
f74005d888
Remove dependency in correction settings.
...
Autocorrection and next-word suggestion are independent,
but the settings UI creates a dependency.
Bug: 19896768.
Change-Id: Ibcdd497cdfd7b9c3a69c61e0c2d116d67df84ef8
2015-03-23 18:13:03 -07:00
67bb8cbe61
Disable Hinglish locale.
...
Bug: 19899126.
Change-Id: I1824233b3bcb6cb6579714a7eb375ea2cebc39db
2015-03-23 18:05:04 -07:00
b1333cbc42
am fac1f631: Merge "Reenable next-word suggestion if autocorrection reenabled."
...
* commit 'fac1f631b96c4ab852be950c03ef3d57faa86b28':
Reenable next-word suggestion if autocorrection reenabled.
2015-03-24 00:32:33 +00:00
66ef3268a0
am c4f71f6b: Merge "We can\'t spell check Russian without an LM."
...
* commit 'c4f71f6be88ffd610293ebe420733351ca016a83':
We can't spell check Russian without an LM.
2015-03-24 00:32:31 +00:00
fac1f631b9
Merge "Reenable next-word suggestion if autocorrection reenabled."
2015-03-24 00:25:47 +00:00
c4f71f6be8
Merge "We can't spell check Russian without an LM."
2015-03-24 00:25:34 +00:00
1eedcfb290
Reenable next-word suggestion if autocorrection reenabled.
...
Bug: 19896768.
Change-Id: Ifeb3401612416e58bb362c5250ce0c15fc4b3c45
2015-03-23 17:16:10 -07:00
4262ef4e11
We can't spell check Russian without an LM.
...
Change-Id: I635a51acc2e45aebe23a1cf69da1b5c72a6ac9e1
2015-03-23 16:37:13 -07:00
823aaf0f7d
am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
...
* commit 'c787bd666330f872e2f3aff0d3f590724f95d574':
Block overflow menu during setup. DO NOT MERGE
2015-03-23 23:22:26 +00:00
c787bd6663
am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
...
* commit '6f09e99d24b4f67ef14d78a18a246da67cca650e':
Block overflow menu during setup. DO NOT MERGE
2015-03-23 23:16:51 +00:00
6f09e99d24
am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
...
* commit '2bc9f4073d872ac3ffb56e44bef39e24da12a66f':
Block overflow menu during setup. DO NOT MERGE
2015-03-23 23:10:58 +00:00
2f7c39d3b7
am 67c06fc2: (-s ours) am c9e43b1d: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
...
* commit '67c06fc2b85efe221a949ef0fbffa1280efc55ba':
2015-03-23 22:53:02 +00:00
Geoff Mendal
The Android Automerger
Mohammadinamul Sheik
Jatin Matani
Dan Zivkovic
Ulas Kirazci
Chieu Nguyen
Qiwen Zhao