Merge pull request #13085 from gasolin/issue-929889

Bug 929889 - Remove 'portrait-primary' lock in system app, r=alive

apps/system/js/attention_screen.js

@@ -137,8 +137,8 @@ var AttentionScreen = {
     // alternatively, if the newly appended frame is the visible frame
     // and we are in the status bar mode, expend to full screen mode.
     if (!this.isVisible()) {
-      // Attention screen now only support portrait mode.
-      screen.mozLockOrientation('portrait-primary');
+      // Attention screen now only support default orientation.
+      screen.mozLockOrientation(ScreenLayout.defaultOrientation);
 
       this.attentionScreen.classList.add('displayed');
       this.mainScreen.classList.add('attention');
@@ -240,8 +240,8 @@ var AttentionScreen = {
 
   // expend the attention screen overlay to full screen
   show: function as_show() {
-    // Attention screen now only support portrait mode.
-    screen.mozLockOrientation('portrait-primary');
+    // Attention screen now only support default orientation.
+    screen.mozLockOrientation(ScreenLayout.defaultOrientation);
 
     this.attentionScreen.lastElementChild.dataset.appRequestedSmallSize = false;
 

apps/system/js/cards_view.js

@@ -172,8 +172,8 @@ var CardsView = (function() {
       cardsView.addEventListener('mousedown', CardsView);
     }
 
-    // Make sure we're in portrait mode
-    screen.mozLockOrientation('portrait-primary');
+    // Make sure we're in default orientation
+    screen.mozLockOrientation(ScreenLayout.defaultOrientation);
 
     // If there is a displayed app, take keyboard focus away
     if (displayedApp)

apps/system/js/lockscreen.js

@@ -825,8 +825,7 @@ var LockScreen = {
       this.overlay.classList.remove('no-transition');
 
     this.mainScreen.classList.add('locked');
-
-    screen.mozLockOrientation('portrait-primary');
+    screen.mozLockOrientation(ScreenLayout.defaultOrientation);
 
     if (!wasAlreadyLocked) {
       if (document.mozFullScreen)

apps/system/js/sleep_menu.js

@@ -100,8 +100,8 @@ var SleepMenu = {
     this.elements.container.innerHTML = '';
     this.buildMenu(this.generateItems());
     this.elements.overlay.classList.add('visible');
-    // Lock orientation to portrait
-    screen.mozLockOrientation('portrait-primary');
+    // Lock to default orientation
+    screen.mozLockOrientation(ScreenLayout.defaultOrientation);
   },
 
   buildMenu: function sm_buildMenu(items) {

apps/system/test/unit/cards_view_test.js

@@ -5,6 +5,7 @@
 mocha.setup({ignoreLeaks: true});
 
 requireApp('system/test/unit/mock_gesture_detector.js');
+requireApp('system/test/unit/mock_screen_layout.js');
 requireApp('system/test/unit/mock_trusted_ui_manager.js');
 requireApp('system/test/unit/mock_utility_tray.js');
 requireApp('system/test/unit/mock_window_manager.js');
@@ -14,6 +15,7 @@ requireApp('system/test/unit/mock_popup_manager.js');
 
 var mocksForCardsView = new MocksHelper([
   'GestureDetector',
+  'ScreenLayout',
   'TrustedUIManager',
   'UtilityTray',
   'WindowManager',
@@ -25,7 +27,7 @@ var mocksForCardsView = new MocksHelper([
 suite('cards view >', function() {
   var subject;
 
-  var screenNode, realMozLockOrientation;
+  var screenNode, realMozLockOrientation, realScreenLayout;
   var cardsView;
 
   mocksForCardsView.attachTestHelpers();
@@ -39,13 +41,16 @@ suite('cards view >', function() {
 
     screenNode.appendChild(cardsView);
     document.body.appendChild(screenNode);
+    realScreenLayout = window.ScreenLayout;
+    window.ScreenLayout = MockScreenLayout;
     realMozLockOrientation = screen.mozLockOrientation;
     screen.mozLockOrientation = MockLockScreen.mozLockOrientation;
     requireApp('system/js/cards_view.js', done);
   });
 
   suiteTeardown(function() {
     screenNode.parentNode.removeChild(screenNode);
+    window.ScreenLayout = realScreenLayout;
     screen.mozLockOrientation = realMozLockOrientation;
   });