Bug 1084522 - Don't redefine layout attribute in IconTabWidget. r=lucasr, a=lmandel
authorRichard Newman <rnewman@mozilla.com>
Mon, 20 Oct 2014 12:05:40 -0700
changeset 225917 66297e95dc47
parent 225916 9f2160ac83d5
child 225918 a02835abdd00
push id4067
push userryanvm@gmail.com
push date2014-11-03 16:24 +0000
treeherdermozilla-beta@72938afdf993 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr, lmandel
bugs1084522
milestone34.0
Bug 1084522 - Don't redefine layout attribute in IconTabWidget. r=lucasr, a=lmandel
mobile/android/base/resources/values/attrs.xml
mobile/android/base/toolbar/TabCounter.java
--- 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"/>
@@ -95,17 +94,17 @@
     <declare-styleable name="TabsTray">
         <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
@@ -41,17 +41,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);