Bug 1047143 - close aps entering task-manager, exitToApp to open/restore

* Fix assumption that home event means homescreen opens in SoundManager,
* Remove appwillopen handler in AttentionScreen, applaunch will suffice
* Also listen for search app's requestforeground event

apps/system/js/app_transition_controller.js

@@ -232,7 +232,7 @@
       this.app.reviveBrowser();
       this.app.launchTime = Date.now();
       this.app.fadeIn();
-      this.app.setVisible(true);
+      this.app.requestForeground();
 
       // TODO:
       // May have orientation manager to deal with lock orientation request.
@@ -250,7 +250,7 @@
       this.resetTransition();
       this.app.element.removeAttribute('aria-hidden');
       this.app.element.classList.add('active');
-      this.app.setVisible(true);
+      this.app.requestForeground();
 
       // TODO:
       // May have orientation manager to deal with lock orientation request.

apps/system/js/app_window.js

@@ -1886,8 +1886,9 @@
    */
   AppWindow.prototype.enterTaskManager = function aw_enterTaskManager() {
     this._dirtyStyleProperties = {};
-    if (this.element) {
+    if (this.element && this.transitionController) {
       this.element.classList.add('in-task-manager');
+      this.close( this.isActive() ? 'to-cardview' : 'immediate' );
     }
   };
 
@@ -1897,8 +1898,10 @@
   AppWindow.prototype.leaveTaskManager = function aw_leaveTaskManager() {
     if (this.element) {
       this.element.classList.remove('in-task-manager');
-      this.unapplyStyle(this._dirtyStyleProperties);
-      this._dirtyStyleProperties = null;
+      if (this._dirtyStyleProperties) {
+        this.unapplyStyle(this._dirtyStyleProperties);
+        this._dirtyStyleProperties = null;
+      }
     }
   };
 
@@ -1975,5 +1978,9 @@
     win.focus();
   };
 
+  AppWindow.prototype.requestForeground = function aw_requestForeground() {
+    this.publish('requestforeground');
+  };
+
   exports.AppWindow = AppWindow;
 }(window));

apps/system/js/app_window_manager.js

@@ -208,7 +208,7 @@
 
         appNext.open(immediateTranstion ? 'immediate' :
                       ((switching === true) ? 'invoked' : openAnimation));
-        if (appCurrent) {
+        if (appCurrent && appCurrent.instanceID !== appNext.instanceID) {
           appCurrent.close(immediateTranstion ? 'immediate' :
             ((switching === true) ? 'invoking' : closeAnimation));
         } else {
@@ -552,6 +552,7 @@
             this._activeApp.getTopMostWindow().blur();
           }
           break;
+
         case 'sheetstransitionstart':
           if (document.mozFullScreen) {
             document.mozCancelFullScreen();

apps/system/js/attention_screen.js

@@ -49,7 +49,6 @@ var AttentionScreen = {
     window.addEventListener('home', this.hide.bind(this));
     window.addEventListener('holdhome', this.hide.bind(this));
     window.addEventListener('global-search-request', this.hide.bind(this));
-    window.addEventListener('appwillopen', this.appOpenHandler.bind(this));
     window.addEventListener('launchapp', this.appLaunchHandler.bind(this));
     window.addEventListener('emergencyalert', this.hide.bind(this));
 
@@ -85,14 +84,6 @@ var AttentionScreen = {
     }
   },
 
-  appOpenHandler: function as_appHandler(evt) {
-    // If the user presses the home button we will still hide the attention
-    // screen. But in the case of an app crash we'll keep it fully open
-    if (!evt.detail.isHomescreen) {
-      this.hide();
-    }
-  },
-
   appLaunchHandler: function as_appLaunchHandler(evt) {
     if (!evt.detail.stayBackground) {
       this.hide();

apps/system/js/card.js

@@ -182,6 +182,8 @@
 
     this._fetchElements();
     this._registerEvents();
+
+    this.app.enterTaskManager();
     this.publish('rendered');
     return elem;
   };
@@ -222,6 +224,9 @@
     if (element && element.parentNode) {
       element.parentNode.removeChild(element);
     }
+    if (this.app) {
+      this.app.leaveTaskManager();
+    }
     this.element = this.manager = this.app = null;
     this.publish('destroyed');
   };

apps/system/js/sound_manager.js

@@ -229,7 +229,7 @@
     window.addEventListener('appopen', this);
     window.addEventListener('ftudone', this);
     window.addEventListener('holdhome', this);
-    window.addEventListener('home', this);
+    window.addEventListener('homescreenopening', this);
     window.addEventListener('homescreenopened', this);
 
     this.initVibrationUserPref();
@@ -265,7 +265,7 @@
     window.removeEventListener('appopen', this);
     window.removeEventListener('ftudone', this);
     window.removeEventListener('holdhome', this);
-    window.removeEventListener('home', this);
+    window.removeEventListener('homescreenopening', this);
     window.removeEventListener('homescreenopened', this);
   };
 
@@ -323,7 +323,7 @@
       case 'holdhome':
         CustomDialog.hide();
         break;
-      case 'home':
+      case 'homescreenopening':
       case 'homescreenopened':
         this.homescreenVisible = true;
         CustomDialog.hide();

apps/system/js/stack_manager.js

@@ -196,6 +196,10 @@ var StackManager = {
         }
         break;
       case 'home':
+        // only handle home events if task manager is not visible
+        if (window.taskManager && window.taskManager.isShown()) {
+          return;
+        }
         this._moveToTop(this.position);
         this.position = -1;
         this.commitClose();
@@ -267,7 +271,7 @@ var StackManager = {
       if (sConfig.instanceID == instanceID) {
         this._stack.splice(i, 1);
 
-        if (i <= this.position && this.position > 0) {
+        if (i <= this.position && this.position >= 0) {
           this.position--;
         }
         return;

apps/system/js/task_card.js

@@ -80,7 +80,6 @@
    */
   TaskCard.prototype.render = function tc_render() {
     Card.prototype.render.call(this);
-    this.app.enterTaskManager();
     return this.element;
   };
 
@@ -95,10 +94,6 @@
    * @memberof TaskCard.prototype
    */
   TaskCard.prototype.destroy = function tc_destroy() {
-    var app = this.app;
-    if (app) {
-      app.leaveTaskManager();
-    }
     Card.prototype.destroy.call(this);
   };