Merge pull request #20121 from timdream/keyboard-hide-lock

Bug 1018335 - removeFocus() when the screen is locked, r=rudyl

apps/system/js/keyboard_manager.js

@@ -140,6 +140,7 @@ var KeyboardManager = {
     window.addEventListener('applicationsetupdialogshow', this);
     window.addEventListener('mozmemorypressure', this);
     window.addEventListener('sheetstransitionstart', this);
+    window.addEventListener('lock', this);
 
     // To handle keyboard layout switching
     window.addEventListener('mozChromeEvent', function(evt) {
@@ -473,6 +474,8 @@ var KeyboardManager = {
           this._debug('mozmemorypressure event; keyboard removed');
         }
         break;
+      case 'lock':
+        /* falls through */
       case 'sheetstransitionstart':
         if (this.hasActiveKeyboard) {
           // Instead of hideKeyboard(), we should removeFocus() here.

apps/system/test/unit/keyboard_manager_test.js

@@ -518,6 +518,22 @@ suite('KeyboardManager', function() {
 
       KeyboardManager.hasActiveKeyboard = realActive;
     });
+
+    test('lock event: do nothing if no keyboard', function() {
+      var spy = this.sinon.spy(navigator.mozInputMethod, 'removeFocus');
+      trigger('lock');
+      assert.ok(spy.notCalled);
+    });
+
+    test('lock event: hide keyboard if needed', function() {
+      var realActive = KeyboardManager.hasActiveKeyboard;
+      KeyboardManager.hasActiveKeyboard = true;
+      var spy = this.sinon.spy(navigator.mozInputMethod, 'removeFocus');
+      trigger('lock');
+      sinon.assert.calledOnce(spy);
+
+      KeyboardManager.hasActiveKeyboard = realActive;
+    });
   });
 
   suite('Hide Keyboard', function() {