Merge fx-team to m-c. a=merge

CLOSED TREE

browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js

@@ -11,7 +11,8 @@ let listener = {
     QueryInterface: XPCOMUtils.generateQI([ Ci.nsIObserver ]),
     observe: function(aSubject, aTopic, aData) {
         if (aSubject instanceof Ci.nsIScriptError &&
-                aSubject.category === "XPConnect JavaScript") {
+            aSubject.category === "XPConnect JavaScript" &&
+            aSubject.sourceName.contains("webconsole")) {
             good = false;
         }
     }

configure.in

@@ -3953,7 +3953,6 @@ MOZ_ANDROID_SEARCH_ACTIVITY=
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_ANDROID_SHARE_OVERLAY=
-MOZ_ANDROID_NEW_TABLET_UI=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_PAY=
@@ -5042,14 +5041,6 @@ if test -n "$MOZ_ANDROID_TAB_QUEUE"; then
     AC_DEFINE(MOZ_ANDROID_TAB_QUEUE)
 fi
 
-dnl ========================================================
-dnl = Include New Tablet UI on Android
-dnl = Temporary build flag to allow development in Nightly
-dnl ========================================================
-if test -n "$MOZ_ANDROID_NEW_TABLET_UI"; then
-    AC_DEFINE(MOZ_ANDROID_NEW_TABLET_UI)
-fi
-
 dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
@@ -8548,7 +8539,6 @@ AC_SUBST(MOZ_ANDROID_READING_LIST_SERVICE)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY)
 AC_SUBST(MOZ_ANDROID_TAB_QUEUE)
-AC_SUBST(MOZ_ANDROID_NEW_TABLET_UI)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 AC_SUBST(ENABLE_STRIP)

mobile/android/base/favicons/Favicons.java

@@ -5,10 +5,9 @@
 
 package org.mozilla.gecko.favicons;
 
+import android.graphics.drawable.Drawable;
 import org.mozilla.gecko.AboutPages;
-import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
@@ -23,11 +22,11 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -450,17 +449,13 @@ public class Favicons {
             return;
         }
 
-        final boolean isNewTabletEnabled = NewTabletUI.isEnabled(context);
         final Resources res = context.getResources();
 
-        // Decode the default Favicon ready for use. We'd preferably override the drawable for
-        // different screen sizes, but since we need phone's default favicon on tablet (in
-        // ToolbarDisplayLayout), we can't.
-        final int defaultFaviconDrawableID =
-                isNewTabletEnabled ? R.drawable.new_tablet_default_favicon : R.drawable.favicon;
-        defaultFavicon = BitmapFactory.decodeResource(res, defaultFaviconDrawableID);
-        if (defaultFavicon == null) {
-            throw new IllegalStateException("Null default favicon was returned from the resources system!");
+        final Drawable defaultFaviconDrawable = res.getDrawable(R.drawable.toolbar_favicon_default);
+        if (defaultFaviconDrawable instanceof BitmapDrawable) {
+            defaultFavicon = ((BitmapDrawable) defaultFaviconDrawable).getBitmap();
+        } else {
+            throw new IllegalStateException("toolbar_favicon_default wasn't a bitmap resource!");
         }
 
         defaultFaviconSize = res.getDimensionPixelSize(R.dimen.favicon_bg);
@@ -469,10 +464,7 @@ public class Favicons {
         // downscaled to this size or discarded.
         largestFaviconSize = res.getDimensionPixelSize(R.dimen.favicon_largest_interesting_size);
 
-        // TODO: Remove this branch when old tablet is removed.
-        final int browserToolbarFaviconSizeDimenID = NewTabletUI.isEnabled(context) ?
-                R.dimen.new_tablet_tab_strip_favicon_size : R.dimen.browser_toolbar_favicon_size;
-        browserToolbarFaviconSize = res.getDimensionPixelSize(browserToolbarFaviconSizeDimenID);
+        browserToolbarFaviconSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_favicon_size);
 
         faviconsCache = new FaviconCache(FAVICON_CACHE_SIZE_BYTES, largestFaviconSize);
 

mobile/android/base/home/TopSitesGridItemView.java

@@ -35,6 +35,8 @@ public class TopSitesGridItemView extends RelativeLayout {
     private static final ScaleType SCALE_TYPE_THUMBNAIL = ScaleType.CENTER_CROP;
     private static final ScaleType SCALE_TYPE_URL       = ScaleType.CENTER_INSIDE;
 
+    private static final int THUMBNAIL_DEFAULT_FAVICON_ID = R.drawable.favicon_globe;
+
     // Child views.
     private final TextView mTitleView;
     private final TopSitesThumbnailView mThumbnailView;
@@ -216,7 +218,7 @@ public class TopSitesGridItemView extends RelativeLayout {
     public void displayThumbnail(Bitmap thumbnail) {
         if (thumbnail == null) {
             // Show a favicon based view instead.
-            displayThumbnail(R.drawable.favicon);
+            displayThumbnail(THUMBNAIL_DEFAULT_FAVICON_ID);
             return;
         }
         mThumbnailSet = true;
@@ -242,7 +244,7 @@ public class TopSitesGridItemView extends RelativeLayout {
         ImageLoader.with(getContext())
                    .load(imageUrl)
                    .noFade()
-                   .error(R.drawable.favicon)
+                   .error(THUMBNAIL_DEFAULT_FAVICON_ID)
                    .into(mThumbnailView);
     }
 
@@ -270,7 +272,7 @@ public class TopSitesGridItemView extends RelativeLayout {
 
         if (favicon == null) {
             // Should show default favicon.
-            displayThumbnail(R.drawable.favicon);
+            displayThumbnail(THUMBNAIL_DEFAULT_FAVICON_ID);
             return;
         }
 

mobile/android/base/home/TopSitesPanel.java

@@ -659,7 +659,7 @@ public class TopSitesPanel extends HomeFragment {
             }
 
             // Otherwise, do this until the async lookup returns.
-            view.displayThumbnail(R.drawable.favicon);
+            view.displayThumbnail(R.drawable.favicon_globe);
 
             // Give each side enough information to shake hands later.
             listener.setLoadId(loadId);

mobile/android/base/menu/GeckoMenuInflater.java

@@ -131,22 +131,7 @@ public class GeckoMenuInflater extends MenuInflater {
         item.visible = a.getBoolean(R.styleable.MenuItem_android_visible, true);
         item.enabled = a.getBoolean(R.styleable.MenuItem_android_enabled, true);
         item.hasSubMenu = false;
-
-        // TODO: (bug 1058909) Remove this branch when we remove old tablet. We do this to
-        // avoid using a new menu resource for new tablet.
-        final int iconResID;
-        if (!NewTabletUI.isEnabled(mContext)) {
-            iconResID = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
-        } else {
-            if (item.id == R.id.reload) {
-                iconResID = R.drawable.new_tablet_ic_menu_reload;
-            } else if (HardwareUtils.isLargeTablet() && item.id == R.id.bookmark) {
-                iconResID = R.drawable.new_tablet_ic_menu_bookmark_add;
-            } else {
-                iconResID = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
-            }
-        }
-        item.iconRes = iconResID;
+        item.iconRes = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
 
         if (Versions.feature11Plus) {
             item.showAsAction = a.getInt(R.styleable.MenuItem_android_showAsAction, 0);

mobile/android/base/menu/MenuItemActionBar.java

@@ -22,9 +22,7 @@ public class MenuItemActionBar extends ThemedImageButton
     }
 
     public MenuItemActionBar(Context context, AttributeSet attrs) {
-        // TODO: Remove this branch (and associated attr) when old tablet is removed.
-        this(context, attrs, (NewTabletUI.isEnabled(context)) ?
-                R.attr.menuItemActionBarStyleNewTablet : R.attr.menuItemActionBarStyle);
+        this(context, attrs, R.attr.menuItemActionBarStyle);
     }
 
     public MenuItemActionBar(Context context, AttributeSet attrs, int defStyle) {

mobile/android/base/moz.build

@@ -560,7 +560,7 @@ else:
 
 # Only bother to include new tablet code if we're building for tablet-capable
 # OS releases.
-if CONFIG['MOZ_ANDROID_NEW_TABLET_UI'] and max_sdk_version >= 11:
+if max_sdk_version >= 11:
     gbjar.sources += [
         'tabs/TabStrip.java',
         'tabs/TabStripAdapter.java',
@@ -684,7 +684,7 @@ ANDROID_GENERATED_RESFILES += [
 for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
             'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
-            'MOZ_ANDROID_NEW_TABLET_UI', 'MOZ_ANDROID_TAB_QUEUE'):
+            'MOZ_ANDROID_TAB_QUEUE'):
     if CONFIG[var]:
         DEFINES[var] = 1
 

mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml

@@ -7,6 +7,6 @@
      lock icons so we offset it using this drawable to compensate. -->
 <inset
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/favicon"
+    android:drawable="@drawable/favicon_globe"
     android:insetTop="@dimen/new_tablet_site_security_unknown_inset_top"
     android:insetBottom="@dimen/new_tablet_site_security_unknown_inset_bottom"/>

mobile/android/base/resources/drawable/toolbar_favicon_default.xml

@@ -4,4 +4,4 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@null"/>
+        android:src="@drawable/favicon_globe" />

mobile/android/base/resources/layout-large-v11/browser_toolbar.xml

@@ -82,6 +82,7 @@
             android:id="@+id/menu"
             style="@style/UrlBar.ImageButton.NewTablet"
             android:layout_alignParentRight="true"
+            android:layout_marginRight="6dp"
             android:contentDescription="@string/menu"
             android:background="@drawable/new_tablet_action_bar_button"
             android:visibility="gone"/>

mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml

@@ -8,7 +8,7 @@
 
    <ImageView
         android:id="@+id/favicon"
-        android:layout_width="@dimen/new_tablet_tab_strip_favicon_size"
+        android:layout_width="@dimen/browser_toolbar_favicon_size"
         android:layout_height="match_parent"
         android:layout_marginRight="8dp"
         android:scaleType="centerInside"

mobile/android/base/resources/layout/two_line_page_row.xml

@@ -12,7 +12,7 @@
                                           android:layout_width="@dimen/favicon_bg"
                                           android:layout_height="@dimen/favicon_bg"
                                           android:layout_margin="16dp"
-                                          tools:background="@drawable/favicon"/>
+                                          tools:background="@drawable/favicon_globe"/>
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"

mobile/android/base/resources/menu-large-v11/browser_app_menu.xml

@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
+          android:icon="@drawable/new_tablet_ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>
 

mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml

@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
+          android:icon="@drawable/new_tablet_ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>
 
@@ -21,7 +21,7 @@
           android:visible="false"/>
 
     <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
+          android:icon="@drawable/new_tablet_ic_menu_bookmark_add"
           android:title="@string/bookmark"
           android:showAsAction="always"/>
 

mobile/android/base/resources/values-large-v11/dimens.xml

@@ -7,6 +7,7 @@
 
     <dimen name="browser_toolbar_height">56dp</dimen>
     <dimen name="browser_toolbar_button_padding">16dp</dimen>
+    <dimen name="browser_toolbar_favicon_size">16dp</dimen>
 
     <dimen name="tabs_counter_size">26sp</dimen>
     <dimen name="panel_grid_view_column_width">200dp</dimen>

mobile/android/base/resources/values-large-v11/styles.xml

@@ -75,23 +75,10 @@
     </style>
 
     <style name="Widget.MenuItemActionBar">
-        <item name="android:layout_width">@dimen/browser_toolbar_height</item>
-        <item name="android:layout_height">@dimen/browser_toolbar_height</item>
-        <item name="android:background">@drawable/action_bar_button</item>
-        <item name="android:scaleType">fitCenter</item>
-
-        <!-- We split up padding* because we can't override it in *.NewTablet otherwise. -->
-        <item name="android:paddingTop">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingBottom">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingLeft">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingRight">@dimen/browser_toolbar_button_padding</item>
-    </style>
-
-    <style name="Widget.MenuItemActionBar.NewTablet">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:scaleType">center</item>
         <item name="android:background">@drawable/new_tablet_action_bar_button</item>
+        <item name="android:scaleType">center</item>
 
         <!-- layout_width/height doesn't work here, likely because it's
              an ImageButton, so we use padding instead.

mobile/android/base/resources/values-large-v11/themes.xml

@@ -14,7 +14,6 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="arrowPopupWidth">400dp</item>
-        <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
     </style>
 
     <style name="GeckoStartPane" parent="Gecko.Dialog"/>

mobile/android/base/resources/values/dimens.xml

@@ -29,7 +29,6 @@
     <dimen name="new_tablet_tab_strip_height">48dp</dimen>
     <dimen name="new_tablet_tab_strip_item_width">208dp</dimen>
     <dimen name="new_tablet_tab_strip_item_margin">-28dp</dimen>
-    <dimen name="new_tablet_tab_strip_favicon_size">16dp</dimen>
     <dimen name="new_tablet_tab_strip_fading_edge_size">15dp</dimen>
     <dimen name="new_tablet_site_security_height">60dp</dimen>
     <dimen name="new_tablet_site_security_width">34dp</dimen>
@@ -38,7 +37,6 @@
     <dimen name="new_tablet_site_security_padding_horizontal">8dp</dimen>
     <dimen name="new_tablet_site_security_right_margin">1dp</dimen>
     <dimen name="new_tablet_browser_toolbar_height">60dp</dimen>
-    <dimen name="new_tablet_browser_toolbar_menu_right_margin">6dp</dimen>
     <dimen name="new_tablet_browser_toolbar_menu_item_width">56dp</dimen>
     <!-- Padding combines with an 18dp image to form the menu item width and height. -->
     <dimen name="new_tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>

mobile/android/base/tabs/TabStripItemView.java

@@ -71,7 +71,7 @@ public class TabStripItemView extends ThemedLinearLayout
         backgroundDrawable = new ResizablePathDrawable(new TabCurveShape(), tabColors);
         setBackgroundDrawable(backgroundDrawable);
 
-        faviconSize = res.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_favicon_size);
+        faviconSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_favicon_size);
 
         LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
         setOnClickListener(new View.OnClickListener() {
@@ -209,7 +209,7 @@ public class TabStripItemView extends ThemedLinearLayout
     private void updateFavicon(final Bitmap favicon) {
         if (favicon == null) {
             lastFavicon = null;
-            faviconView.setImageResource(R.drawable.new_tablet_default_favicon);
+            faviconView.setImageResource(R.drawable.toolbar_favicon_default);
             return;
         }
         if (favicon == lastFavicon) {

mobile/android/base/tests/testSettingsMenuItems.java

@@ -45,7 +45,7 @@ public class testSettingsMenuItems extends PixelTest {
 
     // Display menu items.
     String[] PATH_DISPLAY = { StringHelper.DISPLAY_SECTION_LABEL };
-    final String[] TITLE_BAR_LABEL_ARR = { StringHelper.TITLE_BAR_LABEL, StringHelper.SHOW_PAGE_TITLE_LABEL,
+    final String[] TITLE_BAR_LABEL_ARR = { StringHelper.TITLE_BAR_LABEL, StringHelper.SHOW_PAGE_ADDRESS_LABEL,
         StringHelper.SHOW_PAGE_TITLE_LABEL, StringHelper.SHOW_PAGE_ADDRESS_LABEL };
     String[][] OPTIONS_DISPLAY = {
         { StringHelper.TEXT_SIZE_LABEL },

mobile/android/base/toolbar/BrowserToolbarTablet.java

@@ -10,7 +10,6 @@ import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
@@ -51,16 +50,6 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
         setButtonEnabled(forwardButton, true);
 
         updateForwardButtonState(ForwardButtonState.HIDDEN);
-
-        setRightMargin();
-    }
-
-    private void setRightMargin() {
-        // TODO: Remove this hack in favor of resources when old tablet is removed.
-        final Resources res = getContext().getResources();
-        final int rightMargin =
-                res.getDimensionPixelOffset(R.dimen.new_tablet_browser_toolbar_menu_right_margin);
-        setPadding(getPaddingLeft(), getPaddingTop(), rightMargin, getPaddingBottom());
     }
 
     private void updateForwardButtonState(final ForwardButtonState state) {

mobile/android/base/toolbar/ToolbarDisplayLayout.java

@@ -409,7 +409,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
             image = Bitmap.createScaledBitmap(image, mFaviconSize, mFaviconSize, false);
             mFavicon.setImageBitmap(image);
         } else {
-            mFavicon.setImageResource(R.drawable.favicon);
+            mFavicon.setImageResource(R.drawable.favicon_globe);
         }
     }
 

mobile/android/base/widget/FaviconView.java

@@ -214,7 +214,7 @@ public class FaviconView extends ImageView {
     }
 
     public void showDefaultFavicon() {
-        setImageResource(R.drawable.favicon);
+        setImageResource(R.drawable.favicon_globe);
         mDominantColor = 0;
     }
 

mobile/android/confvars.sh

@@ -76,9 +76,6 @@ MOZ_WEBGL_CONFORMANT=1
 # Enable the Search Activity.
 MOZ_ANDROID_SEARCH_ACTIVITY=1
 
-# Use the new tablet UI. This will go away in Bug 1106935.
-MOZ_ANDROID_NEW_TABLET_UI=1
-
 # Enable the share handler.
 MOZ_ANDROID_SHARE_OVERLAY=1
 

toolkit/components/social/SocialService.jsm

@@ -549,15 +549,13 @@ this.SocialService = {
     let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
     let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
 
-
-    // foreign activation uses the activation url for origin, directory or
-    // internal (in-product) activations use the origin defined in the manifest
-    let url = data.installType == "foreign" ?
-            data.url :
-            data.installType == "directory" ||
-            data.installType == "internal" ?
-              data.manifest.origin : undefined;
-    let requestingURI = Services.io.newURI(url, null, null);
+    // internal/directory activations need to use the manifest origin, any other
+    // use the domain activation is occurring on
+    let url = data.url;
+    if (data.installType == "internal" || data.installType == "directory") {
+      url = data.manifest.origin;
+    }
+    let requestingURI =  Services.io.newURI(url, null, null);
     let productName = brandBundle.GetStringFromName("brandShortName");
 
     let message = browserBundle.formatStringFromName("service.install.description",