Merge pull request #33355 from albertopq/1225333-statusbar-gallery

Bug 1225333 - setAppearence when requesting unlock r=etienne
mozilla-b2g · Nov 26, 2015 · 6f4aa7b · 6f4aa7b
2 parents 5d4c318 + 1a96942
commit 6f4aa7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js
@@ -87,6 +87,7 @@
       window.addEventListener('iconshown', this);
       window.addEventListener('iconhidden', this);
       window.addEventListener('iconrendered', this);
+
       if (Service.query('FtuLauncher.isFinished')) {
         this.finishInit();
       } else {
@@ -138,6 +139,7 @@
       window.addEventListener('activityopened', this);
       window.addEventListener('homescreenopened', this);
       window.addEventListener('stackchanged', this);
+      window.addEventListener('lockscreen-request-unlock', this);
 
       // Listen to updates dialog
       window.addEventListener('updatepromptshown', this);
@@ -232,6 +234,7 @@
           /* falls through */
         case 'appclosed':
         case 'hierarchytopmostwindowchanged':
+        case 'lockscreen-request-unlock':
         case 'appchromeexpanded':
           this.element.classList.remove('hidden');
           this.setAppearance();

diff --git a/apps/system/test/unit/statusbar_test.js b/apps/system/test/unit/statusbar_test.js
@@ -684,6 +684,10 @@ suite('system/Statusbar', function() {
       testEventThatShows.bind(this)('appchromeexpanded');
     });
 
+    test('lockscreen-request-unlock', function() {
+      testEventThatShows.bind(this)('lockscreen-request-unlock');
+    });
+
     test('apptitlestatechanged', function() {
       testEventThatShows.bind(this)('apptitlestatechanged');
     });