Merge pull request #29394 from albertopq/1100332-shb-utility-tray

Bug 1100332 - Fixing issues when closing the utility-tray with SHB r=mhenretty

apps/system/js/utility_tray.js

@@ -23,6 +23,8 @@ window.UtilityTray = {
 
   ambientIndicator: document.getElementById('ambient-indicator'),
 
+  softwareButtons: document.getElementById('software-buttons'),
+
   grippy: document.getElementById('utility-tray-grippy'),
 
   container: document.getElementById('desktop-notifications-container'),
@@ -53,6 +55,7 @@ window.UtilityTray = {
       this.statusbarIcons.addEventListener(name, this);
       this.grippy.addEventListener(name, this);
       this.topPanel.addEventListener(name, this);
+      this.softwareButtons.addEventListener(name, this);
     }, this);
 
     window.addEventListener('screenchange', this);
@@ -238,14 +241,21 @@ window.UtilityTray = {
           return;
         }
 
+        // Prevent swipe up gesture when closed.
+        if (target === this.softwareButtons && !this.showing) {
+          return;
+        }
+
         // Prevent swipe down gesture when already opened/opening.
-        if (target !== this.grippy && this.showing) {
+        if (target !== this.grippy &&
+            target !== this.softwareButtons && this.showing) {
           return;
         }
 
         if (target !== this.overlay && target !== this.grippy &&
             evt.currentTarget !== this.statusbarIcons &&
-            evt.currentTarget !== this.topPanel) {
+            evt.currentTarget !== this.topPanel &&
+            evt.currentTarget !== this.softwareButtons) {
           return;
         }
 

apps/system/test/unit/utility_tray_test.js

@@ -94,6 +94,9 @@ suite('system/UtilityTray', function() {
     var ambientIndicator = document.createElement('div');
     ambientIndicator.style.cssText = 'height: 2px; display: block;';
 
+    var softwareButtons = document.createElement('div');
+    softwareButtons.style.cssText = 'height: 20px; display: block;';
+
     stubById = this.sinon.stub(document, 'getElementById', function(id) {
       switch (id) {
         case 'statusbar':
@@ -114,6 +117,8 @@ suite('system/UtilityTray', function() {
           return topPanel;
         case 'ambient-indicator':
           return ambientIndicator;
+        case 'software-buttons':
+          return softwareButtons;
         default:
           return null;
       }
@@ -275,6 +280,11 @@ suite('system/UtilityTray', function() {
         fakeTouches(480, 380, UtilityTray.grippy);
         assert.equal(UtilityTray.showing, false);
       });
+
+      test('should be hidden by a drag from the softwareButtons', function() {
+        fakeTouches(480, 380, UtilityTray.softwareButtons);
+        assert.equal(UtilityTray.showing, false);
+      });
     });
   });