Merge pull request #25326 from tedders1/bug-1078901

Bug 1078901 - Confirmation dialog when deleting apps blocks notfications and software home button. r=kgrandon
mozilla-b2g · Oct 23, 2014 · bb6f9d1 · bb6f9d1
2 parents 8e1fe3c + a82fc6e
commit bb6f9d1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/apps/system/index.html b/apps/system/index.html
@@ -889,6 +889,9 @@ <h2 id="permission-message"></h2>
       -->
       </div>
 
+      <div id="app-uninstall-dialog" data-z-index-level="app-uninstall-dialog" style="margin: 1000">
+      </div>
+
       <form id="app-install-dialog" class='app-install-dialog generic-dialog'
             data-type="confirm" role="dialog"
             data-z-index-level="app-install-dialog">

diff --git a/apps/system/js/app_install_manager.js b/apps/system/js/app_install_manager.js
@@ -275,7 +275,7 @@ var AppInstallManager = {
     }
 
     var dialog = new ConfirmDialogHelper(dialogConfig);
-    dialog.show(document.body);
+    dialog.show(document.getElementById('app-uninstall-dialog'));
   },
 
   prepareForDownload: function ai_prepareForDownload(app) {

diff --git a/apps/system/style/app_install_manager/app_install_manager.css b/apps/system/style/app_install_manager/app_install_manager.css
@@ -41,6 +41,10 @@
   pointer-events: auto;
 }
 
+#app-uninstall-dialog {
+  position: absolute
+}
+
 #setup-installed-app-dialog section,
 #ime-layout-dialog section,
 #app-install-dialog section,

diff --git a/apps/system/style/themes/default/core.css b/apps/system/style/themes/default/core.css
@@ -38,6 +38,17 @@
   }
 }
 
+#screen.software-button-enabled gaia-confirm {
+  margin-bottom: var(--software-home-button-height);
+}
+
+@media (orientation: landscape) {
+  #screen.software-button-enabled gaia-confirm {
+    margin-bottom: 0;
+    margin-right: var(--software-home-button-height);
+  }
+}
+
 [role="dialog"].generic-dialog:before {
   content: "";
   display: inline-block;

diff --git a/apps/system/style/zindex.css b/apps/system/style/zindex.css
@@ -213,6 +213,7 @@
 #screen > [data-z-index-level="app"] > .appWindow.active > [data-z-index-level="value-selector"],
 #screen > [data-z-index-level="ime-layout-dialog"],
 #screen > [data-z-index-level="app-install-dialog"],
+#screen > [data-z-index-level="app-uninstall-dialog"],
 #screen > [data-z-index-level="updates-download-dialog"],
 #screen > [data-z-index-level="updates-viaDataConnection-dialog"],
 #screen > [data-z-index-level="emergency-callback-dialog"],
@@ -297,6 +298,7 @@
 #screen:-moz-full-screen-ancestor > [data-z-index-level="cards-view"],
 #screen:-moz-full-screen-ancestor > [data-z-index-level="permission-screen"],
 #screen:-moz-full-screen-ancestor > [data-z-index-level="app-install-dialog"],
+#screen:-moz-full-screen-ancestor > [data-z-index-level="app-uninstall-dialog"],
 #screen:-moz-full-screen-ancestor > [data-z-index-level="ime-layout-dialog"],
 #screen:-moz-full-screen-ancestor > [data-z-index-level="fullscreen-software-home-button"],
 #screen:-moz-full-screen-ancestor > [data-z-index-level="gesture-panel"],