Commit graph

34702 commits

Author SHA1 Message Date
Geoff Mendal
116b058bfb am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '013b37a7e91e27eb060a6a23ac607a7172f2b058':
2015-03-26 21:00:38 +00:00
Geoff Mendal
8dc2209ebf am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '3a496eb86cf9db788874d1b0e4628a9c3efd1a2d':
2015-03-26 21:00:37 +00:00
Geoff Mendal
7424f8c587 am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '585f624ba50bc34eb2661bf2f6d3e266d1a55acf':
2015-03-26 21:00:35 +00:00
Geoff Mendal
6b26d9d4fa am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '256e2ffddf7e22bdf201c44a880a36e73b8f8fbe':
2015-03-26 21:00:33 +00:00
Geoff Mendal
043af5575e am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit 'f4d53d6fdad4335e817c6f71e730b0cf0165de0a':
2015-03-26 21:00:31 +00:00
Geoff Mendal
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
Geoff Mendal
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
Geoff Mendal
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
Geoff Mendal
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
Geoff Mendal
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
Geoff Mendal
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
Geoff Mendal
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
Mohammadinamul Sheik
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
Geoff Mendal
622093dd3a Import translations. DO NOT MERGE
Change-Id: I8a29d7e960f826153ce0942fd5f4a179775377e3
Auto-generated-cl: translation import
2015-03-25 06:32:16 -07:00
Jatin Matani
3b175a0b5d Merge "Check for accounts when enabling sync features." 2015-03-24 23:38:01 +00:00
Jatin Matani
bb2773176f Check for accounts when enabling sync features.
Bug:19895917
Change-Id: I2f2f535f5a5c17c5642a5c44d2fd20a520ccfd73
2015-03-24 15:37:11 -07:00
Mohammadinamul Sheik
600cca16cb Merge "Force download the dictionaries after the apk package is updated." 2015-03-24 22:20:46 +00:00
Mohammadinamul Sheik
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
Jatin Matani
3b0c2eb09f Merge "Avoid NPE when logging the entry point to Settings" 2015-03-24 19:57:08 +00:00
Jatin Matani
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
Dan Zivkovic
a8b14a4fdd Merge "Change DictionaryStats to report content version." 2015-03-24 19:20:27 +00:00
Ulas Kirazci
e1b91d4138 Merge "DO NOT MERGE. Do not access metadatadb from main thread." 2015-03-24 18:28:53 +00:00
Dan Zivkovic
72278d3047 Change DictionaryStats to report content version.
Bug 19908719.

Change-Id: I5a00b5277e9cd7d964b53ff5823bada21be110fa
2015-03-24 11:19:34 -07:00
Dan Zivkovic
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
Chieu Nguyen
37cb7a7371 Merge "Disable Hinglish locale." 2015-03-24 01:34:02 +00:00
Chieu Nguyen
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
Chieu Nguyen
67bb8cbe61 Disable Hinglish locale.
Bug: 19899126.
Change-Id: I1824233b3bcb6cb6579714a7eb375ea2cebc39db
2015-03-23 18:05:04 -07:00
Chieu Nguyen
fac1f631b9 Merge "Reenable next-word suggestion if autocorrection reenabled." 2015-03-24 00:25:47 +00:00
Dan Zivkovic
c4f71f6be8 Merge "We can't spell check Russian without an LM." 2015-03-24 00:25:34 +00:00
Chieu Nguyen
1eedcfb290 Reenable next-word suggestion if autocorrection reenabled.
Bug: 19896768.
Change-Id: Ifeb3401612416e58bb362c5250ce0c15fc4b3c45
2015-03-23 17:16:10 -07:00
Dan Zivkovic
4262ef4e11 We can't spell check Russian without an LM.
Change-Id: I635a51acc2e45aebe23a1cf69da1b5c72a6ac9e1
2015-03-23 16:37:13 -07:00
Dan Zivkovic
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
Dan Zivkovic
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
Dan Zivkovic
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
Qiwen Zhao
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
Dan Zivkovic
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
Dan Zivkovic
ffd808b446 We ship with English, so we can't unit test French
Change-Id: I20a470a18ca0cd47fe7588958be904eb23fdf1a2
2015-03-23 14:42:10 -07:00
Dan Zivkovic
3e792f61ad Minor unit test fixes.
Change-Id: I800bb33a10f31d5b934b00768bc8fe4776e36f90
2015-03-23 13:31:51 -07:00
Jatin Matani
fa296fa625 Merge "Move ManagedProfileUtils to overridable" 2015-03-23 20:17:13 +00:00
Dan Zivkovic
e02d483187 Merge "Block overflow menu during setup." 2015-03-23 20:13:16 +00:00
Jatin Matani
cb27c4fe2e Move ManagedProfileUtils to overridable
Bug:19532354
Change-Id: I50b3ae11b6e58f07b482353b624b1a7a73eadc99
2015-03-23 11:57:48 -07:00
Dan Zivkovic
75fc9080a8 Block overflow menu during setup.
Bug 19866981.

Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
2015-03-23 11:34:02 -07:00
Jatin Matani
bc1cf0817b Merge "Fix some i18n messaging" 2015-03-23 18:20:49 +00:00
Geoff Mendal
13271bfde8 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:57:25 +00:00
Geoff Mendal
772d823ec8 Import translations. DO NOT MERGE
Change-Id: Iff35b6266f1f7249bd4a506f6667fef40eddb530
Auto-generated-cl: translation import
2015-03-20 23:56:44 -07:00
Geoff Mendal
479a70900d Merge "Import translations. DO NOT MERGE" 2015-03-21 06:56:24 +00:00
Geoff Mendal
23c18bba30 Import translations. DO NOT MERGE
Change-Id: Ia8ca67d58e6b3e6325da4f3711aa9dc3a7a1c355
Auto-generated-cl: translation import
2015-03-20 23:55:58 -07:00
Geoff Mendal
eb5bbdee59 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:55:18 +00:00
Geoff Mendal
93b18efaac Import translations. DO NOT MERGE
Change-Id: I4ab87513a95932a4c68ee21002a4784d8d577d68
Auto-generated-cl: translation import
2015-03-20 23:54:53 -07:00
Geoff Mendal
ed7688c342 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:54:44 +00:00