Merge pull request #25143 from gmarty/Bug-1061969-fix

Bug 1082650 - Utility tray must consider software home button
mozilla-b2g · Oct 15, 2014 · 6446367 · 6446367
2 parents a177679 + c9ea74f
commit 6446367
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/apps/system/js/utility_tray.js b/apps/system/js/utility_tray.js
@@ -2,7 +2,7 @@
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
-/* global CostControl */
+/* global CostControl, softwareButtonManager */
 
 var UtilityTray = {
   shown: false,
@@ -321,7 +321,8 @@ var UtilityTray = {
 
     this.notifications.style.transition = '';
     this.notifications.style.transform =
-      'translateY(' + (window.innerHeight - dy - 30 /* StatusBar */) + 'px)';
+      'translateY(' + (window.innerHeight - dy - 30 /* StatusBar */ -
+      softwareButtonManager.height) + 'px)';
   },
 
   onTouchEnd: function ut_onTouchEnd(touch) {

diff --git a/apps/system/style/utility_tray/utility_tray.css b/apps/system/style/utility_tray/utility_tray.css
@@ -70,6 +70,6 @@
 
 @media (orientation: landscape) {
   #screen.software-button-enabled #utility-tray-notifications {
-    width: calc(100% - var(--software-home-button-height));
+    width: calc(100%);
   }
 }
diff --git a/apps/system/test/unit/utility_tray_test.js b/apps/system/test/unit/utility_tray_test.js
@@ -5,12 +5,14 @@
 requireApp('system/shared/test/unit/mocks/mock_lazy_loader.js');
 requireApp('system/test/unit/mock_app_window.js');
 requireApp('system/test/unit/mock_statusbar.js');
+requireApp('system/test/unit/mock_software_button_manager.js');
 require('/shared/test/unit/mocks/mock_system.js');
 
 var mocksHelperForUtilityTray = new MocksHelper([
   'LazyLoader',
   'System',
-  'StatusBar'
+  'StatusBar',
+  'SoftwareButtonManager'
 ]);
 mocksHelperForUtilityTray.init();
 
@@ -19,6 +21,7 @@ suite('system/UtilityTray', function() {
   var fakeEvt;
   var fakeElement;
   var originalLocked;
+  var originalSoftwareButtonManager;
   mocksHelperForUtilityTray.attachTestHelpers();
 
   function createEvent(type, bubbles, cancelable, detail) {
@@ -51,6 +54,9 @@ suite('system/UtilityTray', function() {
   }
 
   setup(function(done) {
+    originalSoftwareButtonManager = window.softwareButtonManager;
+    window.softwareButtonManager = window.MocksoftwareButtonManager;
+
     var statusbar = document.createElement('div');
     statusbar.style.cssText = 'height: 100px; display: block;';
 
@@ -107,6 +113,8 @@ suite('system/UtilityTray', function() {
     stubById.restore();
     window.System.locked = false;
     window.System.currentApp = null;
+
+    window.softwareButtonManager = originalSoftwareButtonManager;
   });
 
   suite('show', function() {