Bug 633599 - App menu should be hidden instead of collapsed during startup [r=mbrubeck]

mobile/chrome/content/AppMenu.js

@@ -8,7 +8,7 @@ var AppMenu = {
     if (BrowserUI.activePanel || BrowserUI.isPanelVisible())
       return;
     this.panel.setAttribute("count", this.panel.childNodes.length);
-    this.panel.collapsed = false;
+    this.panel.hidden = false;
 
     addEventListener("keypress", this, true);
 
@@ -17,7 +17,7 @@ var AppMenu = {
   },
 
   hide: function hide() {
-    this.panel.collapsed = true;
+    this.panel.hidden = true;
 
     removeEventListener("keypress", this, true);
 
@@ -26,7 +26,7 @@ var AppMenu = {
   },
 
   toggle: function toggle() {
-    this.panel.collapsed ? this.show() : this.hide();
+    this.panel.hidden ? this.show() : this.hide();
   },
 
   handleEvent: function handleEvent(aEvent) {

mobile/chrome/content/browser.xul

@@ -666,7 +666,7 @@
       </vbox>
     </hbox>
 
-    <hbox id="appmenu" bottom="0" collapsed="true" align="stretch" oncommand="AppMenu.hide();">
+    <hbox id="appmenu" bottom="0" hidden="true" align="stretch" oncommand="AppMenu.hide();">
       <toolbarbutton class="appmenu-button"
         label="&appMenu.siteOptions;"
         image="chrome://browser/skin/images/appmenu-site-hdpi.png"

mobile/themes/core/browser.css

@@ -1583,9 +1583,9 @@ pageaction:not([image]) > hbox >.pageaction-image {
 }
 
 @media (@orientation@: portrait) {
-  #appmenu[count="4"],
-  #appmenu[count="5"],
-  #appmenu[count="6"] {
+  #appmenu:not([hidden])[count="4"],
+  #appmenu:not([hidden])[count="5"],
+  #appmenu:not([hidden])[count="6"] {
     height: @appmenu_portrait_height@;
     display: inline-block;
   }