Merge fx-team to m-c
authorWes Kocher <wkocher@mozilla.com>
Mon, 13 Jan 2014 20:49:18 -0800
changeset 163240 34dddf6f7ec1b05534483e8181a8e48278aa914b
parent 163233 b114534a9386a426a8e95075c15690fc2fb06750 (current diff)
parent 163239 e512dcbdb0d9f4fb2a285faf97dec8a96073fd20 (diff)
child 163241 654854b387dd43d819a872ae20a4ebcdf63f690e
child 163249 9fa9f0ba98ec56c02f314b3b02c58a5da86e6434
child 163265 05495edfe4ec17027c0fb7a778224c3de3c02868
child 163287 f8b39dc79dffe97df19f19a748a41b6f9dcee713
push id25987
push userkwierso@gmail.com
push dateTue, 14 Jan 2014 04:49:27 +0000
treeherdermozilla-central@34dddf6f7ec1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone29.0a1
first release with
nightly linux32
34dddf6f7ec1 / 29.0a1 / 20140114030236 / files
nightly linux64
34dddf6f7ec1 / 29.0a1 / 20140114030236 / files
nightly mac
34dddf6f7ec1 / 29.0a1 / 20140114030236 / files
nightly win32
34dddf6f7ec1 / 29.0a1 / 20140114030236 / files
nightly win64
34dddf6f7ec1 / 29.0a1 / 20140114030236 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge fx-team to m-c
--- a/browser/themes/shared/devtools/webconsole.inc.css
+++ b/browser/themes/shared/devtools/webconsole.inc.css
@@ -374,8 +374,46 @@ a {
 .theme-light .navigation-marker .url {
   background: #fff; /* mainBackgroundColor */
 }
 
 .theme-light .inlined-variables-view iframe {
   border-color: #ccc;
 }
 
+@media (max-width: 500px) {
+  .message > .timestamp {
+    display: none;
+  }
+  .toolbarbutton-text {
+    display: none;
+  }
+  .hud-console-filter-toolbar .webconsole-filter-button {
+    min-width: 40px;
+  }
+  .hud-console-filter-toolbar .webconsole-clear-console-button {
+    min-width: 25px;
+  }
+  .webconsole-filter-button > .toolbarbutton-menubutton-button:before {
+    width: 16px;
+    height: 16px;
+    margin-left: 1px;
+  }
+  .toolbarbutton-menubutton-dropmarker {
+    margin: 0px;
+  }
+}
+
+@media (max-width: 300px) {
+  .hud-console-filter-toolbar {
+    -moz-box-orient: vertical;
+  }
+  .toolbarbutton-text {
+    display: -moz-box;
+  }
+  .devtools-toolbarbutton {
+    margin-top: 3px;
+  }
+  .hud-console-filter-toolbar .hud-filter-box,
+  .hud-console-filter-toolbar .devtools-toolbarbutton {
+    margin-top: 5px;
+  }
+}
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -116,16 +116,17 @@ abstract public class BrowserApp extends
 
     public ViewFlipper mViewFlipper;
     public ActionModeCompatView mActionBar;
     private BrowserToolbar mBrowserToolbar;
     private HomePager mHomePager;
     private View mHomePagerContainer;
     protected Telemetry.Timer mAboutHomeStartupTimer = null;
     private ActionModeCompat mActionMode;
+    private boolean mShowActionModeEndAnimation = false;
 
     private static final int GECKO_TOOLS_MENU = -1;
     private static final int ADDON_MENU_OFFSET = 1000;
     private static class MenuItemInfo {
         public int id;
         public String label;
         public String icon;
         public boolean checkable = false;
@@ -2551,16 +2552,17 @@ abstract public class BrowserApp extends
         if (mActionMode == null) {
             mViewFlipper.showNext();
             LayerMarginsAnimator margins = mLayerView.getLayerMarginsAnimator();
 
             // If the toolbar is dynamic and not currently showing, just slide it in
             if (isDynamicToolbarEnabled() && !margins.areMarginsShown()) {
                 margins.setMaxMargins(0, mViewFlipper.getHeight(), 0, 0);
                 margins.showMargins(false);
+                mShowActionModeEndAnimation = true;
             } else {
                 // Otherwise, we animate the actionbar itself
                 mActionBar.animateIn();
             }
 
             margins.setMarginsPinned(true);
         } else {
             // Otherwise, we're already showing an action mode. Just finish it and show the new one
@@ -2577,12 +2579,21 @@ abstract public class BrowserApp extends
     @Override
     public void endActionModeCompat() {
         if (mActionMode == null) {
             return;
         }
 
         mActionMode.finish();
         mActionMode = null;
-        mLayerView.getLayerMarginsAnimator().setMarginsPinned(false);
+        final LayerMarginsAnimator margins = mLayerView.getLayerMarginsAnimator();
+        margins.setMarginsPinned(false);
+
         mViewFlipper.showPrevious();
+
+        // Only slide the urlbar out if it was hidden when the action mode started
+        // Don't animate hiding it so that there's no flash as we switch back to url mode
+        if (mShowActionModeEndAnimation) {
+            margins.hideMargins(true);
+            mShowActionModeEndAnimation = false;
+        }
     }
 }
--- a/mobile/android/base/GeckoNetworkManager.java
+++ b/mobile/android/base/GeckoNetworkManager.java
@@ -1,15 +1,17 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko;
 
+import org.mozilla.gecko.mozglue.JNITarget;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.DhcpInfo;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
@@ -347,16 +349,19 @@ public class GeckoNetworkManager extends
             return Integer.parseInt(networkOperator.substring(3));
         } else if (type == InfoType.MCC) {
             return Integer.parseInt(networkOperator.substring(0, 3));
         }
 
         return -1;
     }
 
+    /* These are called from javascript c-types. Avoid letting pro-guard delete them */
+    @JNITarget
     public static int getMCC() {
         return getNetworkOperator(InfoType.MCC);
     }
 
+    @JNITarget
     public static int getMNC() {
         return getNetworkOperator(InfoType.MNC);
     }
 }
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -329,16 +329,17 @@ body {
   position: fixed;
   width: 100%;
   bottom: 0px;
   left: 0px;
   margin: 0;
   padding: 0;
   list-style: none;
   background-color: #ced7de;
+  -moz-user-select: none;
 }
 
 .toolbar-hidden {
   transition-property: visibility, opacity;
   transition-duration: 0.7s;
   visibility: hidden;
   opacity: 0.0;
 }