Bug 1084522 - Don't redefine layout attribute in IconTabWidget. r=lucasr
authorRichard Newman <rnewman@mozilla.com>
Mon, 20 Oct 2014 12:05:40 -0700
changeset 211404 caaa0cc9b53d478ec765c6e7b87de4b1d7c250d9
parent 211403 573f42076ad7fdb321624508c72e7d274b68b39d
child 211405 4a19faedc32b4f5fcad0bd48ca3dbc1d71398635
push id27675
push usercbook@mozilla.com
push dateTue, 21 Oct 2014 13:38:44 +0000
treeherdermozilla-central@676acfb44e8b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr
bugs1084522
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1084522 - Don't redefine layout attribute in IconTabWidget. r=lucasr
mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml
mobile/android/base/resources/layout-large-land-v11/tabs_panel_sidebar.xml
mobile/android/base/resources/values/attrs.xml
mobile/android/base/toolbar/TabCounter.java
--- a/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml
+++ b/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml
@@ -70,17 +70,17 @@
                         android:layout_alignLeft="@id/tabs"
                         android:layout_alignRight="@id/tabs"
                         android:layout_alignTop="@id/tabs"
                         android:layout_alignBottom="@id/tabs"
                         android:layout_marginTop="18dp"
                         android:layout_marginBottom="18dp"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
-                        gecko:layout="@layout/new_tablet_tabs_counter"/>
+                        android:layout="@layout/new_tablet_tabs_counter"/>
 
     <org.mozilla.gecko.widget.ThemedImageButton
             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"
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_sidebar.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel_sidebar.xml
@@ -10,17 +10,16 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/background_tabs">
 
-
             <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
                                                     android:layout_width="wrap_content"
                                                     android:layout_height="match_parent"
                                                     android:tabStripEnabled="false"
                                                     android:divider="@drawable/tab_indicator_divider"
                                                     android:layout="@layout/tabs_panel_indicator"/>
 
 
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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/. -->
 
-<resources>
-
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Theme level attributes -->
     <declare-styleable name="GeckoTheme">
 
         <!-- Style for GeckoMenu ListView -->
         <attr name="geckoMenuListViewStyle" format="reference"/>
 
         <!-- Style for MenuItemActionBar -->
         <attr name="menuItemActionBarStyle" format="reference"/>
@@ -101,17 +100,17 @@
     <declare-styleable name="TabsLayout">
         <attr name="tabs">
             <flag name="tabs_normal" value="0x00" />
             <flag name="tabs_private" value ="0x01" />
         </attr>
     </declare-styleable>
 
     <declare-styleable name="TabCounter">
-        <attr name="layout" format="reference"/>
+        <attr name="android:layout"/>
     </declare-styleable>
 
     <declare-styleable name="TextSelectionHandle">
         <attr name="handleType">
             <flag name="start" value="0x01" />
             <flag name="middle" value="0x02" />
             <flag name="end" value="0x03" />
         </attr>
--- a/mobile/android/base/toolbar/TabCounter.java
+++ b/mobile/android/base/toolbar/TabCounter.java
@@ -43,17 +43,17 @@ public class TabCounter extends ThemedTe
         FADE_IN,
         FADE_OUT
     }
 
     public TabCounter(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TabCounter);
-        mLayoutId = a.getResourceId(R.styleable.TabCounter_layout, R.layout.tabs_counter);
+        mLayoutId = a.getResourceId(R.styleable.TabCounter_android_layout, R.layout.tabs_counter);
         a.recycle();
 
         mInflater = LayoutInflater.from(context);
 
         mFlipInForward = createAnimation(-90, 0, FadeMode.FADE_IN, -1 * Z_DISTANCE, false);
         mFlipInBackward = createAnimation(90, 0, FadeMode.FADE_IN, Z_DISTANCE, false);
         mFlipOutForward = createAnimation(0, -90, FadeMode.FADE_OUT, -1 * Z_DISTANCE, true);
         mFlipOutBackward = createAnimation(0, 90, FadeMode.FADE_OUT, Z_DISTANCE, true);