Commit Graph

38024 Commits (c35ca44e5c41c491e5d7b4de4b39a88cf3839cf2)

Author SHA1 Message Date
Geoff Mendal b5cac10334 am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '22f10ac4016c6879f55d65b16765440ff9453f58':
2015-03-26 21:09:12 +00:00
Geoff Mendal 01072c69f1 am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e':
2015-03-26 21:09:10 +00:00
Geoff Mendal b3cde203fd am bbec724b: (-s ours) am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit 'bbec724b2ae4677685a7300ae4b0c1e820cdf33a':
2015-03-26 21:09:09 +00:00
Geoff Mendal 75a054602c am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'ef9b3c13231328e13981d979100063403f4c5768':
2015-03-26 21:05:40 +00:00
Geoff Mendal 78939d6386 am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '4172b16afadaf00168b663464d122213f664923c':
2015-03-26 21:05:38 +00:00
Geoff Mendal fa18dac798 am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '116b058bfb410c2c3bf0c9436645c842406d99b5':
2015-03-26 21:05:37 +00:00
Geoff Mendal 341f7ea74b am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce':
2015-03-26 21:05:32 +00:00
Geoff Mendal 22f10ac401 am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '7424f8c587fb4802d4b923e9b512f66a28f24c97':
2015-03-26 21:05:31 +00:00
Geoff Mendal b2a45cdc1f am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '6b26d9d4fa6fa1e799beccbafab3278af09bf93d':
2015-03-26 21:05:29 +00:00
Geoff Mendal bbec724b2a am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit '043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5':
2015-03-26 21:05:27 +00:00
Geoff Mendal ef9b3c1323 am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'e397cbe2dffe3c7ff81567a8992f66e34df1d495':
2015-03-26 21:00:41 +00:00
Geoff Mendal 4172b16afa am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '92aaaa88d31e21ca72d24ad047195779be83bdcd':
2015-03-26 21:00:40 +00:00
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
The Android Automerger f5c7b5a9f6 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-03-26 19:00:26 +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 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
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 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
Geoff Mendal d858dbce9a Import translations. DO NOT MERGE
Change-Id: Icf917a7c5cfef90668c1a3646c8faa436cdb4eeb
Auto-generated-cl: translation import
2015-03-25 06:36:28 -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
Geoff Mendal 6fd178a6f0 Import translations. DO NOT MERGE
Change-Id: I22ca6baef73303e5ff28b0503fefe050eefd10a1
Auto-generated-cl: translation import
2015-03-25 06:27:07 -07:00
The Android Automerger e8b86f47a8 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-03-25 00:40:32 +00:00
Jatin Matani 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
Jatin Matani 3b175a0b5d Merge "Check for accounts when enabling sync features." 2015-03-24 23:38:01 +00:00
The Android Automerger 9cea85f178 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-03-24 23:34:30 +00:00
The Android Automerger e74be8de58 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-03-24 22:46:40 +00:00
Mohammadinamul Sheik 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
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 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
Jatin Matani 3b0c2eb09f Merge "Avoid NPE when logging the entry point to Settings" 2015-03-24 19:57:08 +00:00
Dan Zivkovic 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
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
The Android Automerger 4fbbc4fdf8 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-03-24 19:00:38 +00:00
Ulas Kirazci 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
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 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