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
67c06fc2b8
am c9e43b1d: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
...
* commit 'c9e43b1dbbefcc5cafea87976e9f6a59163731a0':
2015-03-23 22:43:59 +00:00
33e959f954
am ffd808b4: We ship with English, so we can\'t unit test French
...
* commit 'ffd808b4462875a2c15d471dea020f263b833a60':
We ship with English, so we can't unit test French
2015-03-23 22:19:41 +00:00
2bc9f4073d
Block overflow menu during setup. DO NOT MERGE
...
Bug 19866981.
Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
(cherry picked from commit 75fc9080a8
2015-03-23 21:43:52 +00:00
ffd808b446
We ship with English, so we can't unit test French
...
Change-Id: I20a470a18ca0cd47fe7588958be904eb23fdf1a2
2015-03-23 14:42:10 -07:00
e775215510
am 3e792f61: Minor unit test fixes.
...
* commit '3e792f61ad702b77cc3c4d6d2887e7475f4ffde6':
Minor unit test fixes.
2015-03-23 20:38:40 +00:00
3e792f61ad
Minor unit test fixes.
...
Change-Id: I800bb33a10f31d5b934b00768bc8fe4776e36f90
2015-03-23 13:31:51 -07:00
c6b279905e
am fa296fa6: Merge "Move ManagedProfileUtils to overridable"
...
* commit 'fa296fa625dcd67e17520c264ed506bb4728e487':
Move ManagedProfileUtils to overridable
2015-03-23 20:21:10 +00:00
ff27916c42
am e02d4831: Merge "Block overflow menu during setup."
...
* commit 'e02d4831872e6547af51ce4ef46049281874e324':
Block overflow menu during setup.
2015-03-23 20:17:25 +00:00
fa296fa625
Merge "Move ManagedProfileUtils to overridable"
2015-03-23 20:17:13 +00:00
e02d483187
Merge "Block overflow menu during setup."
2015-03-23 20:13:16 +00:00
641b1ab1a9
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-03-23 19:00:38 +00:00
cb27c4fe2e
Move ManagedProfileUtils to overridable
...
Bug:19532354
Change-Id: I50b3ae11b6e58f07b482353b624b1a7a73eadc99
2015-03-23 11:57:48 -07:00
75fc9080a8
Block overflow menu during setup.
...
Bug 19866981.
Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
2015-03-23 11:34:02 -07:00
4bb77f1554
am bc1cf081: Merge "Fix some i18n messaging"
...
* commit 'bc1cf0817bddceb5dfab81f9ff030fe10eb4a1bc':
Fix some i18n messaging
2015-03-23 18:26:35 +00:00
bc1cf0817b
Merge "Fix some i18n messaging"
2015-03-23 18:20:49 +00:00
76d0db234e
am 13271bfd: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '13271bfde84c56c0bf75868c1a4888c4262b3314':
Import translations. DO NOT MERGE
2015-03-21 17:00:46 +00:00
56d49ebd5a
am 479a7090: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '479a70900d00367691569556a4994ec9ec195f5b':
Import translations. DO NOT MERGE
2015-03-21 17:00:43 +00:00
d4618e4e66
am eb5bbdee: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'eb5bbdee59b99e6290f0c1965a04e472ae72dd04':
Import translations. DO NOT MERGE
2015-03-21 17:00:41 +00:00
The Android Automerger
Mohammadinamul Sheik
Jatin Matani
Dan Zivkovic
Ulas Kirazci
Chieu Nguyen
Qiwen Zhao
Geoff Mendal