Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no …

…telephony support

apps/homescreen/js/grid.js

@@ -18,6 +18,9 @@ var GridManager = (function() {
   // previously already
   var svPreviouslyInstalledApps = [];
 
+  // XXX bug 911696 filter out launch_path
+  var launchPathBlacklist = [];
+
   var container;
 
   var windowWidth = window.innerWidth;
@@ -1014,7 +1017,25 @@ var GridManager = (function() {
       if (!entryPoints[entryPoint].icons)
         continue;
 
-      createOrUpdateIconForApp(app, entryPoint);
+      // do the normal procedure
+      if (launchPathBlacklist.length === 0) {
+        createOrUpdateIconForApp(app, entryPoint);
+        continue;
+      }
+
+      var found = false;
+      // filtering with blacklist
+      for (var i = 0, elemNum = launchPathBlacklist.length;
+         i < elemNum; i++) {
+        if (entryPoints[entryPoint].launch_path === launchPathBlacklist[i]) {
+          found = true;
+          break;
+        }
+      }
+
+      if (!found) {
+        createOrUpdateIconForApp(app, entryPoint);
+      }
     }
   }
 
@@ -1312,7 +1333,18 @@ var GridManager = (function() {
         }
       }
 
-      doInit(options, callback);
+      // XXX bug 911696 get entrypoints blacklist from settings
+      // then doInit
+      if ('mozSettings' in navigator) {
+        var key = 'app.launch_path.blacklist';
+        var req = navigator.mozSettings.createLock().get(key);
+        req.onsuccess = function onsuccess() {
+          launchPathBlacklist = req.result[key] || [];
+          doInit(options, callback);
+        };
+      } else {
+        doInit(options, callback);
+      }
     },
 
     onDragStart: function gm_onDragSart() {

apps/homescreen/test/unit/everything.me_test.js

@@ -1,6 +1,7 @@
 'use strict';
 
 require('/shared/js/lazy_loader.js');
+require('/shared/test/unit/mocks/mock_navigator_moz_settings.js');
 
 requireApp('homescreen/test/unit/mock_everything.me.html.js');
 requireApp('homescreen/test/unit/mock_asyncStorage.js');
@@ -13,11 +14,14 @@ if (!this.asyncStorage) {
 
 suite('everything.me.js >', function() {
   var wrapperNode,
-      realAsyncStorage;
+      realAsyncStorage,
+      realMozSettings;
 
   suiteSetup(function() {
     realAsyncStorage = window.asyncStorage;
     window.asyncStorage = MockasyncStorage;
+    realMozSettings = navigator.mozSettings;
+    navigator.mozSettings = MockNavigatorSettings;
 
     wrapperNode = document.createElement('section');
     wrapperNode.innerHTML = MockEverythingMeHtml;
@@ -28,6 +32,7 @@ suite('everything.me.js >', function() {
 
   suiteTeardown(function() {
     window.asyncStorage = realAsyncStorage;
+    navigator.mozSettings = realMozSettings;
 
     document.body.removeChild(wrapperNode);
   });

apps/homescreen/test/unit/grid_test.js

@@ -2,6 +2,8 @@
 
 mocha.globals(['mozRequestAnimationFrame']);
 
+require('/shared/test/unit/mocks/mock_navigator_moz_settings.js');
+
 requireApp('homescreen/test/unit/mock_page.js');
 requireApp('homescreen/test/unit/mock_icon.js');
 requireApp('homescreen/test/unit/mock_dock_manager.js');
@@ -41,6 +43,7 @@ suite('grid.js >', function() {
 
   var wrapperNode, containerNode;
   var realMozApps;
+  var realMozSettings;
 
   var mocksHelper = mocksHelperForGrid;
 
@@ -50,11 +53,14 @@ suite('grid.js >', function() {
     window.navigator.mozApps = {
       mgmt: MockAppsMgmt
     };
+    realMozSettings = navigator.mozSettings;
+    navigator.mozSettings = MockNavigatorSettings;
 
   });
 
   suiteTeardown(function() {
     window.navigator.mozApps = realMozApps;
+    navigator.mozSettings = realMozSettings;
 
     mocksHelper.suiteTeardown();
   });

apps/homescreen/test/unit/wallpaper_test.js

@@ -1,6 +1,7 @@
 'use strict';
 
-requireApp('homescreen/test/unit/mock_moz_settings.js');
+require('/shared/test/unit/mocks/mock_navigator_moz_settings.js');
+
 requireApp('homescreen/test/unit/mock_moz_activity.js');
 
 requireApp('homescreen/js/wallpaper.js');
@@ -19,9 +20,12 @@ mocksHelperForWallpaper.init();
 suite('wallpaper.js >', function() {
 
   var mocksHelper = mocksHelperForWallpaper, icongrid;
+  var realMozSettings;
 
   suiteSetup(function() {
     mocksHelper.suiteSetup();
+    realMozSettings = navigator.mozSettings;
+    navigator.mozSettings = MockNavigatorSettings;
 
     icongrid = document.createElement('div');
     icongrid.id = 'icongrid';
@@ -33,7 +37,7 @@ suite('wallpaper.js >', function() {
   suiteTeardown(function() {
     document.body.removeChild(icongrid);
 
-    navigator.mozSettings.suiteTeardown();
+    navigator.mozSettings = realMozSettings;
 
     mocksHelper.suiteTeardown();
     delete window.ForwardLock;
@@ -45,8 +49,8 @@ suite('wallpaper.js >', function() {
   });
 
   teardown(function() {
+    window.MockNavigatorSettings.mSettings['wallpaper.image'] = null;
     mocksHelper.teardown();
-    navigator.mozSettings.teardown();
   });
 
   function dispatchLongPress() {
@@ -98,8 +102,7 @@ suite('wallpaper.js >', function() {
     startMozActivity('onsuccess', fakeblob);
 
     // We set the wallpaper.image property to "banana"
-    assert.equal(Object.keys(navigator.mozSettings.result).length, 1);
-    assert.deepEqual(navigator.mozSettings.result['wallpaper.image'],
+    assert.deepEqual(window.MockNavigatorSettings.mSettings['wallpaper.image'],
                      fakeblob);
   });
 
@@ -108,14 +111,14 @@ suite('wallpaper.js >', function() {
     startMozActivity('onsuccess');
 
     // No blob then wallpaper.image property is not defined
-    assert.isNull(navigator.mozSettings.result);
+    assert.isNull(window.MockNavigatorSettings.mSettings['wallpaper.image']);
   });
 
   test('Pick activity has been cancelled ', function() {
     // User cancels
     startMozActivity('onerror');
 
     // Then  wallpaper.image property is not defined
-    assert.isNull(navigator.mozSettings.result);
+    assert.isNull(window.MockNavigatorSettings.mSettings['wallpaper.image']);
   });
 });

build/settings.js

@@ -112,6 +112,7 @@ function execute() {
    'accessibility.invert': false,
    'accessibility.screenreader': false,
    'alarm.enabled': false,
+   'app.launch_path.blacklist': [],
    'app.reportCrashes': 'ask',
    'app.update.interval': 86400,
    'audio.volume.alarm': 15,