Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/561bf3f92ea1 Author: autolander <bug.autolander@gmail.com> Desc: Bug 1102835 - merge pull request #28648 from mnjul:bug_1102835_kb_app_use_ud_to_predict to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/a1670e6c818d Author: John Lu [:mnjul] <jlu@mozilla.com> Desc: Bug 1102835 - Part 3: Enable user dictionary in keyboard settings by default ======== https://hg.mozilla.org/integration/gaia-central/rev/0d8a2cf956ad Author: John Lu [:mnjul] <jlu@mozilla.com> Desc: Bug 1102835 - Part 2: Adjust merging strategy and uniform frequency - The uniform frequency has been reduced from 31 (max) to 10 to facilitate merging strategy's threshold for user dictionary. - In latin.js's prediction merging strategy, if we want to prioritize user dictionary predictions, we can only do so if such predictions have weight >= 1. ======== https://hg.mozilla.org/integration/gaia-central/rev/51246f791867 Author: John Lu [:mnjul] <jlu@mozilla.com> Desc: Bug 1102835 - Part 1: Keyboard UserDictionary: Formally enable prediction engine to predict from user dictionary - We use only one worker which instantiates two Predictions object and use Promise.all() to receive the asynchronous results and merge the results. - A setUserDictionary() function has been added to worker since user dictionary may change even when layout language isn't changed. Necessary wiring from latin.js is added. - An empty user dictionary is stored as |undefined| in IndexedDB, and worker uses a strategy- & proxy-derived pattern to decide whether user dictionary prediction is invoked. - Predictions() are no longer IIFE since we need more than one instances now. - Worker.js is now handled by jshint, removed from jshint xfail list. - The suggestions passed from worker to latin.js annotate whether a suggestion is from user dictionary; latin.js will always consider to show at least one suggestion from user dictionary. Conflicts: apps/keyboard/js/imes/latin/predictions.js apps/keyboard/test/unit/imes/latin/worker_test.js

--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "f42afb94f987404a64b2bc99d951228da21c0bff", 
+        "git_revision": "367a7295f6c27d601ce4d13fa68b4123bb66d0cd", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "de685eb85d06ca8335934c91d89ddc28251ffbb7", 
+    "revision": "561bf3f92ea1de4814aac98c4762db6125c3cdfe", 
     "repo_path": "integration/gaia-central"
 }