From 02a84efb54d5b8704fab527d1383b76ae8e466f8 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Thu, 27 Jun 2013 16:51:50 -0700
Subject: [PATCH] Bug 855888: Remove "Gecko." namespace in XML files.
 [r=bnicholson]

---
 mobile/android/base/GeckoViewsFactory.java    |  49 ++++----
 .../tabs_panel_header.xml                     |  10 +-
 .../layout-large-v11/browser_toolbar.xml      |  72 ++++++------
 .../abouthome_content.xml                     | 104 ++++++++---------
 .../layout-xlarge-v11/awesomebar_search.xml   |  14 +--
 .../layout-xlarge-v11/remote_tabs_group.xml   |  26 ++---
 .../resources/layout/abouthome_addon_row.xml  |  14 +--
 .../resources/layout/abouthome_content.xml    | 110 +++++++++---------
 .../layout/abouthome_last_tabs_row.xml        |  50 ++++----
 .../layout/abouthome_remote_tab_row.xml       |  14 +--
 .../resources/layout/abouthome_section.xml    |  14 +--
 .../layout/awesomebar_folder_row.xml          |  16 +--
 .../base/resources/layout/awesomebar_row.xml  |  16 +--
 .../layout/awesomebar_suggestion_prompt.xml   |  14 +--
 .../layout/awesomebar_suggestion_row.xml      |  16 +--
 .../layout/awesomebar_tab_indicator.xml       |  26 ++---
 .../base/resources/layout/browser_toolbar.xml |  74 ++++++------
 .../resources/layout/remote_tabs_group.xml    |  22 ++--
 .../base/resources/layout/tabs_counter.xml    |  24 ++--
 .../base/resources/layout/tabs_item_cell.xml  |  33 +++---
 .../base/resources/layout/tabs_item_row.xml   |  30 ++---
 .../resources/layout/tabs_panel_header.xml    |  10 +-
 22 files changed, 376 insertions(+), 382 deletions(-)

diff --git a/mobile/android/base/GeckoViewsFactory.java b/mobile/android/base/GeckoViewsFactory.java
index 899e10807b3c..0d05f5c8637e 100644
--- a/mobile/android/base/GeckoViewsFactory.java
+++ b/mobile/android/base/GeckoViewsFactory.java
@@ -37,9 +37,6 @@ public final class GeckoViewsFactory implements LayoutInflater.Factory {
     private static final String GECKO_VIEW_IDENTIFIER = "org.mozilla.gecko.";
     private static final int GECKO_VIEW_IDENTIFIER_LENGTH = GECKO_VIEW_IDENTIFIER.length();
 
-    private static final String GECKO_IDENTIFIER = "Gecko.";
-    private static final int GECKO_IDENTIFIER_LENGTH = GECKO_IDENTIFIER.length();
-
     private final Map<String, Constructor<? extends View>> mFactoryMap;
 
     private GeckoViewsFactory() {
@@ -50,12 +47,6 @@ public final class GeckoViewsFactory implements LayoutInflater.Factory {
         Class<Context> arg1Class = Context.class;
         Class<AttributeSet> arg2Class = AttributeSet.class;
         try {
-            mFactoryMap.put("AboutHomeView", AboutHomeView.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("AddonsSection", AddonsSection.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("LastTabsSection", LastTabsSection.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("PromoBox", PromoBox.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("RemoteTabsSection", RemoteTabsSection.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("TopSitesView", TopSitesView.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("AwesomeBarTabs", AwesomeBarTabs.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("AwesomeBarTabs$BackgroundLayout", AwesomeBarTabs.BackgroundLayout.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("BackButton", BackButton.class.getConstructor(arg1Class, arg2Class));
@@ -64,33 +55,39 @@ public final class GeckoViewsFactory implements LayoutInflater.Factory {
             mFactoryMap.put("FormAssistPopup", FormAssistPopup.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("ForwardButton", ForwardButton.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("GeckoApp$MainLayout", GeckoApp.MainLayout.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("LinkTextView", LinkTextView.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("menu.MenuItemActionBar", MenuItemActionBar.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("menu.MenuItemDefault", MenuItemDefault.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("menu.GeckoMenu$DefaultActionItemBar", GeckoMenu.DefaultActionItemBar.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("FindInPageBar", FindInPageBar.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("IconTabWidget", IconTabWidget.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("RemoteTabs", RemoteTabs.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("ShapedButton", ShapedButton.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("TabRow", TabRow.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("TabsPanel", TabsPanel.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("TabsPanel$TabsListContainer", TabsPanel.TabsListContainer.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("TabsPanel$TabsPanelToolbar", TabsPanel.TabsPanelToolbar.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("TabsTray", TabsTray.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("ThumbnailView", ThumbnailView.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("TextSelectionHandle", TextSelectionHandle.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("gfx.LayerView", LayerView.class.getConstructor(arg1Class, arg2Class));
             mFactoryMap.put("AllCapsTextView", AllCapsTextView.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("Button", GeckoButton.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("EditText", GeckoEditText.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("FrameLayout", GeckoFrameLayout.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("ImageButton", GeckoImageButton.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("ImageView", GeckoImageView.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("LinearLayout", GeckoLinearLayout.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("RelativeLayout", GeckoRelativeLayout.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("TextSwitcher", GeckoTextSwitcher.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("TextView", GeckoTextView.class.getConstructor(arg1Class, arg2Class));
-            mFactoryMap.put("FaviconView", FaviconView.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoButton", GeckoButton.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoEditText", GeckoEditText.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoFrameLayout", GeckoFrameLayout.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoImageButton", GeckoImageButton.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoImageView", GeckoImageView.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoLinearLayout", GeckoLinearLayout.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoRelativeLayout", GeckoRelativeLayout.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoTextSwitcher", GeckoTextSwitcher.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("GeckoTextView", GeckoTextView.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("menu.MenuItemActionBar", MenuItemActionBar.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("menu.MenuItemDefault", MenuItemDefault.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("menu.GeckoMenu$DefaultActionItemBar", GeckoMenu.DefaultActionItemBar.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.AboutHomeView", AboutHomeView.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.AddonsSection", AddonsSection.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.FaviconView", FaviconView.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.LastTabsSection", LastTabsSection.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.LinkTextView", LinkTextView.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.PromoBox", PromoBox.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.RemoteTabsSection", RemoteTabsSection.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.TabRow", TabRow.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.ThumbnailView", ThumbnailView.class.getConstructor(arg1Class, arg2Class));
+            mFactoryMap.put("widget.TopSitesView", TopSitesView.class.getConstructor(arg1Class, arg2Class));
         } catch (NoSuchMethodException nsme) {
             Log.e(LOGTAG, "Unable to initialize views factory", nsme);
         }
@@ -110,8 +107,6 @@ public final class GeckoViewsFactory implements LayoutInflater.Factory {
 
             if (name.startsWith(GECKO_VIEW_IDENTIFIER))
                 viewName = name.substring(GECKO_VIEW_IDENTIFIER_LENGTH);
-            else if (name.startsWith(GECKO_IDENTIFIER))
-                viewName = name.substring(GECKO_IDENTIFIER_LENGTH);
             else
                 return null;
 
diff --git a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml b/mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml
index a29ab759e33b..21dc6aa33b48 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel_header.xml
@@ -5,10 +5,10 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <Gecko.IconTabWidget android:id="@+id/tab_widget"
-                         android:layout_width="wrap_content"
-                         android:layout_height="fill_parent"
-                         android:tabStripEnabled="false"
-                         android:divider="@drawable/tab_indicator_divider"/>
+    <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="fill_parent"
+                                            android:tabStripEnabled="false"
+                                            android:divider="@drawable/tab_indicator_divider"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
index 1b7ab1b96ba3..b0fcd50b31d7 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -11,15 +11,15 @@
                                                 android:layout_height="fill_parent"
                                                 android:background="@drawable/address_bar_bg"/>
 
-    <Gecko.ShapedButton android:id="@+id/tabs"
-                        style="@style/AddressBar.ImageButton"
-                        android:layout_width="84dip"
-                        android:layout_alignParentLeft="true"
-                        gecko:curveTowards="left"
-                        android:background="@drawable/shaped_button"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="6dip"
-                        android:paddingRight="38dip"/>
+    <org.mozilla.gecko.ShapedButton android:id="@+id/tabs"
+                                    style="@style/AddressBar.ImageButton"
+                                    android:layout_width="84dip"
+                                    android:layout_alignParentLeft="true"
+                                    gecko:curveTowards="left"
+                                    android:background="@drawable/shaped_button"
+                                    android:gravity="center_vertical"
+                                    android:paddingLeft="6dip"
+                                    android:paddingRight="38dip"/>
 
     <!-- The TextSwitcher should be shifted 28dp on the right, to avoid
          the curve. On a 56dp space, centering 24dp image will leave
@@ -89,19 +89,19 @@
                      android:contentDescription="@string/site_security"
                      android:visibility="gone"/>
 
-        <Gecko.TextView android:id="@+id/awesome_bar_title"
-                        style="@style/AddressBar.Button"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent"
-                        android:layout_weight="1.0"
-                        android:singleLine="true"
-                        android:paddingRight="8dp"
-                        android:textColor="@color/awesome_bar_title"
-                        android:textColorHint="@color/awesome_bar_title_hint"
-                        android:gravity="center_vertical|left"
-                        android:hint="@string/awesomebar_default_text"
-                        android:layout_gravity="center_vertical"
-                        gecko:autoUpdateTheme="false"/>
+        <org.mozilla.gecko.GeckoTextView android:id="@+id/awesome_bar_title"
+                                         style="@style/AddressBar.Button"
+                                         android:layout_width="fill_parent"
+                                         android:layout_height="fill_parent"
+                                         android:layout_weight="1.0"
+                                         android:singleLine="true"
+                                         android:paddingRight="8dp"
+                                         android:textColor="@color/awesome_bar_title"
+                                         android:textColorHint="@color/awesome_bar_title_hint"
+                                         android:gravity="center_vertical|left"
+                                         android:hint="@string/awesomebar_default_text"
+                                         android:layout_gravity="center_vertical"
+                                         gecko:autoUpdateTheme="false"/>
 
         <ImageButton android:id="@+id/reader"
                      style="@style/AddressBar.ImageButton.Icon"
@@ -125,21 +125,21 @@
                   android:layout_toLeftOf="@id/menu"
                   android:layout_alignWithParentIfMissing="true"/>
 
-    <Gecko.ImageButton android:id="@+id/menu"
-                       style="@style/AddressBar.ImageButton"
-                       android:layout_width="56dip"
-                       android:layout_alignParentRight="true"
-                       android:contentDescription="@string/menu"
-                       android:background="@drawable/action_bar_button"
-                       android:visibility="gone"/>
+    <org.mozilla.gecko.GeckoImageButton android:id="@+id/menu"
+                                        style="@style/AddressBar.ImageButton"
+                                        android:layout_width="56dip"
+                                        android:layout_alignParentRight="true"
+                                        android:contentDescription="@string/menu"
+                                        android:background="@drawable/action_bar_button"
+                                        android:visibility="gone"/>
 
-    <Gecko.ImageView android:id="@+id/menu_icon"
-                     style="@style/AddressBar.ImageButton"
-                     android:layout_alignLeft="@id/menu"
-                     android:layout_alignRight="@id/menu"
-                     android:gravity="center_vertical"
-                     android:src="@drawable/menu_level"
-                     android:visibility="gone"/>
+    <org.mozilla.gecko.GeckoImageView android:id="@+id/menu_icon"
+                                      style="@style/AddressBar.ImageButton"
+                                      android:layout_alignLeft="@id/menu"
+                                      android:layout_alignRight="@id/menu"
+                                      android:gravity="center_vertical"
+                                      android:src="@drawable/menu_level"
+                                      android:visibility="gone"/>
 
     <ImageView android:id="@+id/shadow"
                android:layout_width="fill_parent"
diff --git a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
index 2fd37f815743..d67a60fb9d24 100644
--- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
+++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
@@ -22,43 +22,43 @@
                       android:layout_marginLeft="@dimen/abouthome_gutter_large"
                       android:layout_marginRight="@dimen/abouthome_gutter_small">
 
-            <Gecko.ImageView android:id="@+id/abouthome_logo"
-                             android:src="@drawable/abouthome_logo"
-                             android:layout_width="wrap_content"
-                             android:layout_height="24dip"
-                             android:layout_marginTop="16dip"
-                             android:layout_marginBottom="10dip"
-                             android:layout_marginLeft="12dip"/>
+            <org.mozilla.gecko.GeckoImageView android:id="@+id/abouthome_logo"
+                                              android:src="@drawable/abouthome_logo"
+                                              android:layout_width="wrap_content"
+                                              android:layout_height="24dip"
+                                              android:layout_marginTop="16dip"
+                                              android:layout_marginBottom="10dip"
+                                              android:layout_marginLeft="12dip"/>
 
-            <Gecko.TextView android:id="@+id/top_sites_title"
-                            android:text="@string/abouthome_top_sites_title"
-                            android:layout_width="fill_parent"
-                            android:layout_height="26dip"
-                            android:background="#34FFFFFF"
-                            android:paddingLeft="12dip"
-                            android:textSize="12sp"
-                            android:textColor="@color/abouthome_section_title"
-                            android:textStyle="bold"
-                            android:gravity="left|center_vertical"/>
+            <org.mozilla.gecko.GeckoTextView android:id="@+id/top_sites_title"
+                                             android:text="@string/abouthome_top_sites_title"
+                                             android:layout_width="fill_parent"
+                                             android:layout_height="26dip"
+                                             android:background="#34FFFFFF"
+                                             android:paddingLeft="12dip"
+                                             android:textSize="12sp"
+                                             android:textColor="@color/abouthome_section_title"
+                                             android:textStyle="bold"
+                                             android:gravity="left|center_vertical"/>
 
-            <Gecko.TopSitesView android:id="@+id/top_sites_grid"
-                                style="@style/AboutHome.Thumbnail.Grid"/>
+            <org.mozilla.gecko.widget.TopSitesView android:id="@+id/top_sites_grid"
+                                                   style="@style/AboutHome.Thumbnail.Grid"/>
 
-            <Gecko.PromoBox android:id="@+id/promo_box"
-                            android:background="@drawable/abouthome_promo_box"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginRight="12dp"
-                            android:layout_marginTop="17dp"
-                            android:layout_marginBottom="14dp"
-                            android:drawablePadding="7dp"
-                            android:gravity="center"
-                            android:clickable="true"
-                            android:textSize="16sp"
-                            android:textColor="#FFFFFF"
-                            android:visibility="gone"
-                            android:focusable="true"/>
+            <org.mozilla.gecko.widget.PromoBox android:id="@+id/promo_box"
+                                               android:background="@drawable/abouthome_promo_box"
+                                               android:layout_width="fill_parent"
+                                               android:layout_height="wrap_content"
+                                               android:layout_marginLeft="12dp"
+                                               android:layout_marginRight="12dp"
+                                               android:layout_marginTop="17dp"
+                                               android:layout_marginBottom="14dp"
+                                               android:drawablePadding="7dp"
+                                               android:gravity="center"
+                                               android:clickable="true"
+                                               android:textSize="16sp"
+                                               android:textColor="#FFFFFF"
+                                               android:visibility="gone"
+                                               android:focusable="true"/>
 
         </LinearLayout>
 
@@ -83,26 +83,26 @@
                           android:layout_alignParentLeft="true"
                           android:layout_marginTop="50dip">
 
-                <Gecko.LastTabsSection android:id="@+id/last_tabs"
-                                       android:layout_width="fill_parent"
-                                       android:layout_height="wrap_content"
-                                       android:visibility="gone"
-                                       gecko:title="@string/abouthome_last_tabs_title"
-                                       gecko:more_text="@string/abouthome_last_tabs_open"/>
+                <org.mozilla.gecko.widget.LastTabsSection android:id="@+id/last_tabs"
+                                                          android:layout_width="fill_parent"
+                                                          android:layout_height="wrap_content"
+                                                          android:visibility="gone"
+                                                          gecko:title="@string/abouthome_last_tabs_title"
+                                                          gecko:more_text="@string/abouthome_last_tabs_open"/>
 
-                <Gecko.AddonsSection android:id="@+id/recommended_addons"
-                                     android:layout_width="fill_parent"
-                                     android:layout_height="wrap_content"
-                                     android:visibility="gone"
-                                     gecko:title="@string/abouthome_addons_title"
-                                     gecko:more_text="@string/abouthome_addons_browse"/>
+                <org.mozilla.gecko.widget.AddonsSection android:id="@+id/recommended_addons"
+                                                        android:layout_width="fill_parent"
+                                                        android:layout_height="wrap_content"
+                                                        android:visibility="gone"
+                                                        gecko:title="@string/abouthome_addons_title"
+                                                        gecko:more_text="@string/abouthome_addons_browse"/>
 
-                <Gecko.RemoteTabsSection android:id="@+id/remote_tabs"
-                                         android:layout_width="fill_parent"
-                                         android:layout_height="wrap_content"
-                                         android:visibility="gone"
-                                         gecko:title="@string/remote_tabs"
-                                         gecko:more_text="@string/remote_tabs_show_all"/>
+                <org.mozilla.gecko.widget.RemoteTabsSection android:id="@+id/remote_tabs"
+                                                            android:layout_width="fill_parent"
+                                                            android:layout_height="wrap_content"
+                                                            android:visibility="gone"
+                                                            gecko:title="@string/remote_tabs"
+                                                            gecko:more_text="@string/remote_tabs_show_all"/>
 
             </LinearLayout>
 
diff --git a/mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml b/mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
index f82f38b1e42c..dbfd32bc4bed 100644
--- a/mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
+++ b/mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
@@ -15,13 +15,13 @@
                                                 gecko:curveTowards="none"
                                                 android:background="@drawable/address_bar_bg"/>
 
-    <Gecko.ShapedButton android:id="@+id/dummy_tab"
-                        style="@style/AddressBar.ImageButton"
-                        android:layout_width="84dip"
-                        android:layout_alignParentLeft="true"
-                        gecko:curveTowards="left"
-                        android:background="@drawable/shaped_button"
-                        android:gravity="center_vertical"/>
+    <org.mozilla.gecko.ShapedButton android:id="@+id/dummy_tab"
+                                    style="@style/AddressBar.ImageButton"
+                                    android:layout_width="84dip"
+                                    android:layout_alignParentLeft="true"
+                                    gecko:curveTowards="left"
+                                    android:background="@drawable/shaped_button"
+                                    android:gravity="center_vertical"/>
 
     <view class="org.mozilla.gecko.CustomEditText"
           android:id="@+id/awesomebar_text"
diff --git a/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml b/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
index ff4a1602a676..6c1f5ba06dbf 100644
--- a/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
+++ b/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
@@ -3,16 +3,16 @@
    - 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/. -->
 
-<Gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:id="@+id/client"
-                       android:layout_width="fill_parent"
-                       android:layout_height="@dimen/remote_tab_group_row_height"
-                       style="@style/TabRowTextAppearance.Url"
-                       android:background="@android:color/transparent"
-                       android:paddingLeft="2dip"
-                       android:paddingRight="2dip"
-                       android:textStyle="bold"
-                       android:textSize="12sp"
-                       android:singleLine="false"
-                       android:maxLines="2"
-                       android:gravity="center_vertical"/>
+<org.mozilla.gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                   android:id="@+id/client"
+                                   android:layout_width="fill_parent"
+                                   android:layout_height="@dimen/remote_tab_group_row_height"
+                                   style="@style/TabRowTextAppearance.Url"
+                                   android:background="@android:color/transparent"
+                                   android:paddingLeft="2dip"
+                                   android:paddingRight="2dip"
+                                   android:textStyle="bold"
+                                   android:textSize="12sp"
+                                   android:singleLine="false"
+                                   android:maxLines="2"
+                                   android:gravity="center_vertical"/>
diff --git a/mobile/android/base/resources/layout/abouthome_addon_row.xml b/mobile/android/base/resources/layout/abouthome_addon_row.xml
index 71cf0b64e06d..512ec467b1f8 100644
--- a/mobile/android/base/resources/layout/abouthome_addon_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_addon_row.xml
@@ -3,10 +3,10 @@
    - 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/. -->
 
-<Gecko.TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent"
-                android:layout_height="@dimen/abouthome_rowitem_height"
-                android:paddingLeft="@dimen/abouthome_rowitem_left_padding"
-                android:gravity="center_vertical"
-                android:drawablePadding="12dip"
-                style="@style/AboutHome.RowItem.TextRow"/>
+<org.mozilla.gecko.GeckoTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                 android:layout_width="fill_parent"
+                                 android:layout_height="@dimen/abouthome_rowitem_height"
+                                 android:paddingLeft="@dimen/abouthome_rowitem_left_padding"
+                                 android:gravity="center_vertical"
+                                 android:drawablePadding="12dip"
+                                 style="@style/AboutHome.RowItem.TextRow"/>
diff --git a/mobile/android/base/resources/layout/abouthome_content.xml b/mobile/android/base/resources/layout/abouthome_content.xml
index ec0c44c6b652..78eb43230c01 100644
--- a/mobile/android/base/resources/layout/abouthome_content.xml
+++ b/mobile/android/base/resources/layout/abouthome_content.xml
@@ -16,27 +16,27 @@
                     android:paddingLeft="@dimen/abouthome_gutter_large"
                     android:paddingRight="@dimen/abouthome_gutter_large">
 
-        <Gecko.ImageView android:id="@+id/abouthome_logo"
-                         android:src="@drawable/abouthome_logo"
-                         android:layout_width="wrap_content"
-                         android:layout_height="24dip"
-                         android:layout_marginTop="16dip"
-                         android:layout_marginBottom="10dip"
-                         android:layout_marginLeft="12dip"
-                         android:layout_alignParentTop="true"
-                         android:layout_alignParentLeft="true"/>
+        <org.mozilla.gecko.GeckoImageView android:id="@+id/abouthome_logo"
+                                          android:src="@drawable/abouthome_logo"
+                                          android:layout_width="wrap_content"
+                                          android:layout_height="24dip"
+                                          android:layout_marginTop="16dip"
+                                          android:layout_marginBottom="10dip"
+                                          android:layout_marginLeft="12dip"
+                                          android:layout_alignParentTop="true"
+                                          android:layout_alignParentLeft="true"/>
 
-        <Gecko.TextView android:id="@+id/top_sites_title"
-                        android:text="@string/abouthome_top_sites_title"
-                        android:layout_width="fill_parent"
-                        android:layout_height="26dip"
-                        android:background="#34FFFFFF"
-                        android:paddingLeft="12dip"
-                        android:textSize="12sp"
-                        android:textColor="@color/abouthome_section_title"
-                        android:textStyle="bold"
-                        android:gravity="left|center_vertical"
-                        android:layout_below="@id/abouthome_logo"/>
+        <org.mozilla.gecko.GeckoTextView android:id="@+id/top_sites_title"
+                                         android:text="@string/abouthome_top_sites_title"
+                                         android:layout_width="fill_parent"
+                                         android:layout_height="26dip"
+                                         android:background="#34FFFFFF"
+                                         android:paddingLeft="12dip"
+                                         android:textSize="12sp"
+                                         android:textColor="@color/abouthome_section_title"
+                                         android:textStyle="bold"
+                                         android:gravity="left|center_vertical"
+                                         android:layout_below="@id/abouthome_logo"/>
 
         <ImageView android:src="@drawable/abouthome_icon"
                    android:layout_width="180dp"
@@ -51,45 +51,45 @@
                       android:layout_height="fill_parent"
                       android:layout_below="@id/top_sites_title">
 
-            <Gecko.TopSitesView android:id="@+id/top_sites_grid"
-                                style="@style/AboutHome.Thumbnail.Grid"/>
+            <org.mozilla.gecko.widget.TopSitesView android:id="@+id/top_sites_grid"
+                                                   style="@style/AboutHome.Thumbnail.Grid"/>
 
-            <Gecko.PromoBox android:id="@+id/promo_box"
-                            android:background="@drawable/abouthome_promo_box"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginRight="12dp"
-                            android:layout_marginTop="17dp"
-                            android:layout_marginBottom="14dp"
-                            android:drawablePadding="7dp"
-                            android:gravity="center"
-                            android:clickable="true"
-                            android:textSize="16sp"
-                            android:textColor="#FFFFFF"
-                            android:visibility="gone"
-                            android:focusable="true"/>
+            <org.mozilla.gecko.widget.PromoBox android:id="@+id/promo_box"
+                                               android:background="@drawable/abouthome_promo_box"
+                                               android:layout_width="fill_parent"
+                                               android:layout_height="wrap_content"
+                                               android:layout_marginLeft="12dp"
+                                               android:layout_marginRight="12dp"
+                                               android:layout_marginTop="17dp"
+                                               android:layout_marginBottom="14dp"
+                                               android:drawablePadding="7dp"
+                                               android:gravity="center"
+                                               android:clickable="true"
+                                               android:textSize="16sp"
+                                               android:textColor="#FFFFFF"
+                                               android:visibility="gone"
+                                               android:focusable="true"/>
 
-            <Gecko.LastTabsSection android:id="@+id/last_tabs"
-                                   android:layout_width="fill_parent"
-                                   android:layout_height="wrap_content"
-                                   android:visibility="gone"
-                                   gecko:title="@string/abouthome_last_tabs_title"
-                                   gecko:more_text="@string/abouthome_last_tabs_open"/>
+            <org.mozilla.gecko.widget.LastTabsSection android:id="@+id/last_tabs"
+                                                      android:layout_width="fill_parent"
+                                                      android:layout_height="wrap_content"
+                                                      android:visibility="gone"
+                                                      gecko:title="@string/abouthome_last_tabs_title"
+                                                      gecko:more_text="@string/abouthome_last_tabs_open"/>
 
-            <Gecko.AddonsSection android:id="@+id/recommended_addons"
-                                 android:layout_width="fill_parent"
-                                 android:layout_height="wrap_content"
-                                 android:visibility="gone"
-                                 gecko:title="@string/abouthome_addons_title"
-                                 gecko:more_text="@string/abouthome_addons_browse"/>
+            <org.mozilla.gecko.widget.AddonsSection android:id="@+id/recommended_addons"
+                                                    android:layout_width="fill_parent"
+                                                    android:layout_height="wrap_content"
+                                                    android:visibility="gone"
+                                                    gecko:title="@string/abouthome_addons_title"
+                                                    gecko:more_text="@string/abouthome_addons_browse"/>
 
-            <Gecko.RemoteTabsSection android:id="@+id/remote_tabs"
-                                     android:layout_width="fill_parent"
-                                     android:layout_height="wrap_content"
-                                     android:visibility="gone"
-                                     gecko:title="@string/remote_tabs"
-                                     gecko:more_text="@string/remote_tabs_show_all"/>
+            <org.mozilla.gecko.widget.RemoteTabsSection android:id="@+id/remote_tabs"
+                                                        android:layout_width="fill_parent"
+                                                        android:layout_height="wrap_content"
+                                                        android:visibility="gone"
+                                                        gecko:title="@string/remote_tabs"
+                                                        gecko:more_text="@string/remote_tabs_show_all"/>
 
         </LinearLayout>
 
diff --git a/mobile/android/base/resources/layout/abouthome_last_tabs_row.xml b/mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
index c528cfe71c7e..96471853c8f8 100644
--- a/mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
@@ -9,32 +9,32 @@
                 android:gravity="left|center_vertical"
                 style="@style/AboutHome.RowItem">
 
-    <Gecko.FaviconView android:id="@+id/last_tab_favicon"
-                       android:layout_width="@dimen/favicon_bg"
-                       android:layout_height="@dimen/favicon_bg"
-                       android:layout_marginBottom="6dip"
-                       android:layout_marginLeft="@dimen/abouthome_rowitem_left_padding"
-                       android:layout_centerVertical="true"
-                       android:minWidth="@dimen/favicon_bg"
-                       android:minHeight="@dimen/favicon_bg"
-                       android:background="@drawable/favicon"/>
+    <org.mozilla.gecko.widget.FaviconView android:id="@+id/last_tab_favicon"
+                                          android:layout_width="@dimen/favicon_bg"
+                                          android:layout_height="@dimen/favicon_bg"
+                                          android:layout_marginBottom="6dip"
+                                          android:layout_marginLeft="@dimen/abouthome_rowitem_left_padding"
+                                          android:layout_centerVertical="true"
+                                          android:minWidth="@dimen/favicon_bg"
+                                          android:minHeight="@dimen/favicon_bg"
+                                          android:background="@drawable/favicon"/>
 
-    <Gecko.TextView android:id="@+id/last_tab_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/last_tab_favicon"
-                    android:layout_marginTop="2dip"
-                    android:layout_marginLeft="12dip"
-                    android:layout_marginRight="12dip"
-                    style="@style/AboutHome.LastTabRow.Title"/>
+    <org.mozilla.gecko.GeckoTextView android:id="@+id/last_tab_title"
+                                     android:layout_width="wrap_content"
+                                     android:layout_height="wrap_content"
+                                     android:layout_toRightOf="@id/last_tab_favicon"
+                                     android:layout_marginTop="2dip"
+                                     android:layout_marginLeft="12dip"
+                                     android:layout_marginRight="12dip"
+                                     style="@style/AboutHome.LastTabRow.Title"/>
 
-    <Gecko.TextView android:id="@+id/last_tab_url"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="12dip"
-                    android:layout_marginRight="12dip"
-                    android:layout_toRightOf="@id/last_tab_favicon"
-                    android:layout_below="@id/last_tab_title"
-                    style="@style/AboutHome.LastTabRow.Url"/>
+    <org.mozilla.gecko.GeckoTextView android:id="@+id/last_tab_url"
+                                     android:layout_width="wrap_content"
+                                     android:layout_height="wrap_content"
+                                     android:layout_marginLeft="12dip"
+                                     android:layout_marginRight="12dip"
+                                     android:layout_toRightOf="@id/last_tab_favicon"
+                                     android:layout_below="@id/last_tab_title"
+                                     style="@style/AboutHome.LastTabRow.Url"/>
 
 </RelativeLayout>
diff --git a/mobile/android/base/resources/layout/abouthome_remote_tab_row.xml b/mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
index 68105ba62ab4..accc4780a67f 100644
--- a/mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
@@ -3,10 +3,10 @@
    - 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/. -->
 
-<Gecko.TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent"
-                android:layout_height="@dimen/abouthome_rowitem_height"
-                android:paddingLeft="@dimen/abouthome_rowitem_left_padding"
-                android:gravity="center_vertical"
-                android:paddingRight="12dip"
-                style="@style/AboutHome.RowItem.TextRow"/>
+<org.mozilla.gecko.GeckoTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                 android:layout_width="fill_parent"
+                                 android:layout_height="@dimen/abouthome_rowitem_height"
+                                 android:paddingLeft="@dimen/abouthome_rowitem_left_padding"
+                                 android:gravity="center_vertical"
+                                 android:paddingRight="12dip"
+                                 style="@style/AboutHome.RowItem.TextRow"/>
diff --git a/mobile/android/base/resources/layout/abouthome_section.xml b/mobile/android/base/resources/layout/abouthome_section.xml
index b9b218970f37..ef75c9e5ea0a 100644
--- a/mobile/android/base/resources/layout/abouthome_section.xml
+++ b/mobile/android/base/resources/layout/abouthome_section.xml
@@ -34,12 +34,12 @@
                   android:isScrollContainer="false"
                   android:duplicateParentState="true"/>
 
-    <org.mozilla.gecko.LinkTextView android:id="@+id/more_text"
-                                    android:layout_width="fill_parent"
-                                    android:layout_height="@dimen/abouthome_rowitem_height"
-                                    android:textColor="@color/abouthome_section_more_text"
-                                    android:textSize="12sp"
-                                    android:gravity="center"
-                                    android:focusable="true"/>
+    <org.mozilla.gecko.widget.LinkTextView android:id="@+id/more_text"
+                                           android:layout_width="fill_parent"
+                                           android:layout_height="@dimen/abouthome_rowitem_height"
+                                           android:textColor="@color/abouthome_section_more_text"
+                                           android:textSize="12sp"
+                                           android:gravity="center"
+                                           android:focusable="true"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/awesomebar_folder_row.xml b/mobile/android/base/resources/layout/awesomebar_folder_row.xml
index 59d13c8292d1..b8a95bcc13c5 100644
--- a/mobile/android/base/resources/layout/awesomebar_folder_row.xml
+++ b/mobile/android/base/resources/layout/awesomebar_folder_row.xml
@@ -8,14 +8,14 @@
                 android:layout_height="@dimen/awesomebar_row_height"
                 android:padding="6dip">
 
-    <Gecko.FaviconView android:id="@+id/favicon"
-                       android:src="@drawable/folder"
-                       android:layout_width="@dimen/favicon_bg"
-                       android:layout_height="@dimen/favicon_bg"
-                       android:layout_marginRight="6dip"
-                       android:layout_centerVertical="true"
-                       android:minWidth="@dimen/favicon_bg"
-                       android:minHeight="@dimen/favicon_bg"/>
+    <org.mozilla.gecko.widget.FaviconView android:id="@+id/favicon"
+                                          android:src="@drawable/folder"
+                                          android:layout_width="@dimen/favicon_bg"
+                                          android:layout_height="@dimen/favicon_bg"
+                                          android:layout_marginRight="6dip"
+                                          android:layout_centerVertical="true"
+                                          android:minWidth="@dimen/favicon_bg"
+                                          android:minHeight="@dimen/favicon_bg"/>
 
     <TextView android:id="@+id/title"
               android:layout_width="wrap_content"
diff --git a/mobile/android/base/resources/layout/awesomebar_row.xml b/mobile/android/base/resources/layout/awesomebar_row.xml
index f6815ed3e30f..39e1e30ffdfe 100644
--- a/mobile/android/base/resources/layout/awesomebar_row.xml
+++ b/mobile/android/base/resources/layout/awesomebar_row.xml
@@ -8,14 +8,14 @@
                 android:layout_height="@dimen/awesomebar_row_height"
                 android:padding="6dip">
 
-    <Gecko.FaviconView android:id="@+id/favicon"
-                       android:layout_width="@dimen/favicon_bg"
-                       android:layout_height="@dimen/favicon_bg"
-                       android:layout_marginLeft="6dip"
-                       android:layout_marginRight="6dip"
-                       android:layout_centerVertical="true"
-                       android:minWidth="@dimen/favicon_bg"
-                       android:minHeight="@dimen/favicon_bg"/>
+    <org.mozilla.gecko.widget.FaviconView android:id="@+id/favicon"
+                                          android:layout_width="@dimen/favicon_bg"
+                                          android:layout_height="@dimen/favicon_bg"
+                                          android:layout_marginLeft="6dip"
+                                          android:layout_marginRight="6dip"
+                                          android:layout_centerVertical="true"
+                                          android:minWidth="@dimen/favicon_bg"
+                                          android:minHeight="@dimen/favicon_bg"/>
 
     <ImageView android:id="@+id/bookmark_icon"
                android:layout_width="wrap_content"
diff --git a/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml b/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
index 286efc3181d5..b0380ce99650 100644
--- a/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
+++ b/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
@@ -17,13 +17,13 @@
                   android:gravity="center_vertical"
                   android:padding="10dip">
 
-        <Gecko.TextView android:id="@+id/suggestions_prompt_title"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:textColor="@color/awesome_bar_title"
-                        android:layout_marginLeft="6dip"
-                        android:textSize="14sp"
-                        android:layout_weight="1" />
+        <org.mozilla.gecko.GeckoTextView android:id="@+id/suggestions_prompt_title"
+                                         android:layout_height="wrap_content"
+                                         android:layout_width="wrap_content"
+                                         android:textColor="@color/awesome_bar_title"
+                                         android:layout_marginLeft="6dip"
+                                         android:textSize="14sp"
+                                         android:layout_weight="1" />
 
         <TextView android:id="@+id/suggestions_prompt_yes"
                 android:layout_height="wrap_content"
diff --git a/mobile/android/base/resources/layout/awesomebar_suggestion_row.xml b/mobile/android/base/resources/layout/awesomebar_suggestion_row.xml
index 5f62f908fa45..f169e980f5d7 100644
--- a/mobile/android/base/resources/layout/awesomebar_suggestion_row.xml
+++ b/mobile/android/base/resources/layout/awesomebar_suggestion_row.xml
@@ -9,14 +9,14 @@
                 android:minHeight="@dimen/awesomebar_row_height"
                 android:padding="7dip">
 
-    <Gecko.FaviconView android:id="@+id/suggestion_icon"
-                       android:layout_width="@dimen/favicon_bg"
-                       android:layout_height="@dimen/favicon_bg"
-                       android:layout_marginLeft="6dip"
-                       android:layout_marginRight="6dip"
-                       android:layout_centerVertical="true"
-                       android:minWidth="@dimen/favicon_bg"
-                       android:minHeight="@dimen/favicon_bg"/>
+    <org.mozilla.gecko.widget.FaviconView android:id="@+id/suggestion_icon"
+                                          android:layout_width="@dimen/favicon_bg"
+                                          android:layout_height="@dimen/favicon_bg"
+                                          android:layout_marginLeft="6dip"
+                                          android:layout_marginRight="6dip"
+                                          android:layout_centerVertical="true"
+                                          android:minWidth="@dimen/favicon_bg"
+                                          android:minHeight="@dimen/favicon_bg"/>
 
     <org.mozilla.gecko.FlowLayout android:id="@+id/suggestion_layout"
                                   android:layout_toRightOf="@id/suggestion_icon"
diff --git a/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml b/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
index 56695e40d6a3..07780ff683ff 100644
--- a/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
+++ b/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
@@ -3,16 +3,16 @@
    - 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/. -->
 
-<Gecko.TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:gecko="http://schemas.android.com/apk/res-auto"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_weight="1.0"
-                android:gravity="center"
-                android:background="@drawable/awesomebar_tab_indicator"
-                android:padding="10dp"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textSize="14sp"
-                android:textColor="@color/awesome_bar_title"
-                gecko:autoUpdateTheme="false"/>
+<org.mozilla.gecko.GeckoTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                 xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                                 android:layout_width="wrap_content"
+                                 android:layout_height="fill_parent"
+                                 android:layout_weight="1.0"
+                                 android:gravity="center"
+                                 android:background="@drawable/awesomebar_tab_indicator"
+                                 android:padding="10dp"
+                                 android:singleLine="true"
+                                 android:ellipsize="marquee"
+                                 android:textSize="14sp"
+                                 android:textColor="@color/awesome_bar_title"
+                                 gecko:autoUpdateTheme="false"/>
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index 227547900610..84ccadc48c42 100644
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -48,32 +48,32 @@
     <LinearLayout android:id="@+id/menu_items"
                   style="@style/AddressBar.ImageButton.Unused"/>
 
-    <Gecko.ShapedButton android:id="@+id/menu"
-                        style="@style/AddressBar.ImageButton"
-                        android:layout_width="48dip"
-                        android:layout_alignParentRight="true"
-                        android:contentDescription="@string/menu"
-                        android:background="@drawable/shaped_button"
-                        android:visibility="gone"/>
+    <org.mozilla.gecko.ShapedButton android:id="@+id/menu"
+                                    style="@style/AddressBar.ImageButton"
+                                    android:layout_width="48dip"
+                                    android:layout_alignParentRight="true"
+                                    android:contentDescription="@string/menu"
+                                    android:background="@drawable/shaped_button"
+                                    android:visibility="gone"/>
 
-    <Gecko.ImageView android:id="@+id/menu_icon"
-                     style="@style/AddressBar.ImageButton"
-                     android:layout_alignLeft="@id/menu"
-                     android:layout_alignRight="@id/menu"
-                     android:gravity="center_vertical"
-                     android:src="@drawable/menu_level"
-                     android:visibility="gone"/>
+    <org.mozilla.gecko.GeckoImageView android:id="@+id/menu_icon"
+                                      style="@style/AddressBar.ImageButton"
+                                      android:layout_alignLeft="@id/menu"
+                                      android:layout_alignRight="@id/menu"
+                                      android:gravity="center_vertical"
+                                      android:src="@drawable/menu_level"
+                                      android:visibility="gone"/>
 
-    <Gecko.ShapedButton android:id="@+id/tabs"
-                        style="@style/AddressBar.ImageButton"
-                        android:layout_width="72dip"
-                        android:layout_toLeftOf="@id/menu"
-                        android:layout_alignWithParentIfMissing="true"
-                        gecko:curveTowards="right"
-                        android:background="@drawable/shaped_button"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="37dip"
-                        android:paddingRight="11dip"/>
+    <org.mozilla.gecko.ShapedButton android:id="@+id/tabs"
+                                    style="@style/AddressBar.ImageButton"
+                                    android:layout_width="72dip"
+                                    android:layout_toLeftOf="@id/menu"
+                                    android:layout_alignWithParentIfMissing="true"
+                                    gecko:curveTowards="right"
+                                    android:background="@drawable/shaped_button"
+                                    android:gravity="center_vertical"
+                                    android:paddingLeft="37dip"
+                                    android:paddingRight="11dip"/>
 
     <!-- The TextSwitcher should be shifted 24dp on the left, to avoid
          the curve. On a 48dp space, centering 24dp image will leave
@@ -115,19 +115,19 @@
                      android:contentDescription="@string/site_security"
                      android:visibility="gone"/>
 
-        <Gecko.TextView android:id="@+id/awesome_bar_title"
-                        style="@style/AddressBar.Button"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent"
-                        android:layout_weight="1.0"
-                        android:singleLine="true"
-                        android:paddingRight="8dp"
-                        android:textColor="@color/awesome_bar_title"
-                        android:textColorHint="@color/awesome_bar_title_hint"
-                        android:gravity="center_vertical|left"
-                        android:hint="@string/awesomebar_default_text"
-                        android:layout_gravity="center_vertical"
-                        gecko:autoUpdateTheme="false"/>
+        <org.mozilla.gecko.GeckoTextView android:id="@+id/awesome_bar_title"
+                                         style="@style/AddressBar.Button"
+                                         android:layout_width="fill_parent"
+                                         android:layout_height="fill_parent"
+                                         android:layout_weight="1.0"
+                                         android:singleLine="true"
+                                         android:paddingRight="8dp"
+                                         android:textColor="@color/awesome_bar_title"
+                                         android:textColorHint="@color/awesome_bar_title_hint"
+                                         android:gravity="center_vertical|left"
+                                         android:hint="@string/awesomebar_default_text"
+                                         android:layout_gravity="center_vertical"
+                                         gecko:autoUpdateTheme="false"/>
 
         <ImageButton android:id="@+id/reader"
                      style="@style/AddressBar.ImageButton.Icon"
diff --git a/mobile/android/base/resources/layout/remote_tabs_group.xml b/mobile/android/base/resources/layout/remote_tabs_group.xml
index 45f040094a72..43c49a586db3 100644
--- a/mobile/android/base/resources/layout/remote_tabs_group.xml
+++ b/mobile/android/base/resources/layout/remote_tabs_group.xml
@@ -3,14 +3,14 @@
    - 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/. -->
 
-<Gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:id="@+id/client"
-                       android:layout_width="fill_parent"
-                       android:layout_height="@dimen/remote_tab_group_row_height"
-                       style="@style/TabRowTextAppearance.Url"
-                       android:background="@android:color/transparent"
-                       android:paddingLeft="4dp"
-                       android:paddingRight="4dp"
-                       android:textStyle="bold"
-                       android:textSize="14sp"
-                       android:gravity="center_vertical"/>
+<org.mozilla.gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                   android:id="@+id/client"
+                                   android:layout_width="fill_parent"
+                                   android:layout_height="@dimen/remote_tab_group_row_height"
+                                   style="@style/TabRowTextAppearance.Url"
+                                   android:background="@android:color/transparent"
+                                   android:paddingLeft="4dp"
+                                   android:paddingRight="4dp"
+                                   android:textStyle="bold"
+                                   android:textSize="14sp"
+                                   android:gravity="center_vertical"/>
diff --git a/mobile/android/base/resources/layout/tabs_counter.xml b/mobile/android/base/resources/layout/tabs_counter.xml
index 57ac244626bf..44b1b850cec2 100644
--- a/mobile/android/base/resources/layout/tabs_counter.xml
+++ b/mobile/android/base/resources/layout/tabs_counter.xml
@@ -3,15 +3,15 @@
    - 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/. -->
 
-<Gecko.TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="24dip"
-                android:layout_height="24dip"
-                android:layout_margin="12dip"
-                android:paddingTop="2dip"
-                android:paddingLeft="4dip"
-                android:background="@drawable/tabs_count_foreground"
-                android:textAppearance="@style/TextAppearance.Micro"
-                android:textColor="#FF43484E"
-                android:textStyle="bold"
-                android:duplicateParentState="true"
-                android:gravity="center"/>
+<org.mozilla.gecko.GeckoTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                 android:layout_width="24dip"
+                                 android:layout_height="24dip"
+                                 android:layout_margin="12dip"
+                                 android:paddingTop="2dip"
+                                 android:paddingLeft="4dip"
+                                 android:background="@drawable/tabs_count_foreground"
+                                 android:textAppearance="@style/TextAppearance.Micro"
+                                 android:textColor="#FF43484E"
+                                 android:textStyle="bold"
+                                 android:duplicateParentState="true"
+                                 android:gravity="center"/>
diff --git a/mobile/android/base/resources/layout/tabs_item_cell.xml b/mobile/android/base/resources/layout/tabs_item_cell.xml
index 090f2d051252..6bff41e19eec 100644
--- a/mobile/android/base/resources/layout/tabs_item_cell.xml
+++ b/mobile/android/base/resources/layout/tabs_item_cell.xml
@@ -3,17 +3,17 @@
    - 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/. -->
 
-<Gecko.TabRow xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/TabsItem"
-              android:focusable="true"
-              android:id="@+id/info"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:paddingTop="6dip"
-              android:paddingBottom="6dip"
-              android:paddingLeft="1dip"
-              android:paddingRight="1dip"
-              android:gravity="center">
+<org.mozilla.gecko.widget.TabRow xmlns:android="http://schemas.android.com/apk/res/android"
+                                 style="@style/TabsItem"
+                                 android:focusable="true"
+                                 android:id="@+id/info"
+                                 android:layout_width="fill_parent"
+                                 android:layout_height="wrap_content"
+                                 android:paddingTop="6dip"
+                                 android:paddingBottom="6dip"
+                                 android:paddingLeft="1dip"
+                                 android:paddingRight="1dip"
+                                 android:gravity="center">
 
     <RelativeLayout android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -22,11 +22,10 @@
                     android:background="@drawable/tab_thumbnail"
                     android:duplicateParentState="true">
 
-        <Gecko.ThumbnailView android:id="@+id/thumbnail"
-                             android:layout_width="@dimen/tab_thumbnail_width"
-                             android:layout_height="@dimen/tab_thumbnail_height"
-                             android:src="@drawable/tab_thumbnail_default"/>
-
+        <org.mozilla.gecko.widget.ThumbnailView android:id="@+id/thumbnail"
+                                                android:layout_width="@dimen/tab_thumbnail_width"
+                                                android:layout_height="@dimen/tab_thumbnail_height"
+                                                android:src="@drawable/tab_thumbnail_default"/>
 
         <LinearLayout android:layout_width="@dimen/tab_thumbnail_width"
                       android:layout_height="wrap_content"
@@ -59,4 +58,4 @@
 
     </RelativeLayout>
 
-</Gecko.TabRow>
+</org.mozilla.gecko.widget.TabRow>
diff --git a/mobile/android/base/resources/layout/tabs_item_row.xml b/mobile/android/base/resources/layout/tabs_item_row.xml
index 121e3e19a025..4dfa92c7c999 100644
--- a/mobile/android/base/resources/layout/tabs_item_row.xml
+++ b/mobile/android/base/resources/layout/tabs_item_row.xml
@@ -3,16 +3,16 @@
    - 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/. -->
 
-<Gecko.TabRow xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/TabsItem"
-              android:focusable="true"
-              android:id="@+id/info"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:paddingLeft="12dip"
-              android:paddingTop="6dip"
-              android:paddingBottom="6dip"
-              android:background="@drawable/tab_row">
+<org.mozilla.gecko.widget.TabRow xmlns:android="http://schemas.android.com/apk/res/android"
+                                 style="@style/TabsItem"
+                                 android:focusable="true"
+                                 android:id="@+id/info"
+                                 android:layout_width="fill_parent"
+                                 android:layout_height="wrap_content"
+                                 android:paddingLeft="12dip"
+                                 android:paddingTop="6dip"
+                                 android:paddingBottom="6dip"
+                                 android:background="@drawable/tab_row">
 
     <LinearLayout android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
@@ -20,10 +20,10 @@
                   android:background="@drawable/tab_thumbnail"
                   android:duplicateParentState="true">
 
-        <Gecko.ThumbnailView android:id="@+id/thumbnail"
-                             android:layout_width="@dimen/tab_thumbnail_width"
-                             android:layout_height="@dimen/tab_thumbnail_height"
-                             android:src="@drawable/tab_thumbnail_default"/>
+        <org.mozilla.gecko.widget.ThumbnailView android:id="@+id/thumbnail"
+                                                android:layout_width="@dimen/tab_thumbnail_width"
+                                                android:layout_height="@dimen/tab_thumbnail_height"
+                                                android:src="@drawable/tab_thumbnail_default"/>
 
     </LinearLayout>
 
@@ -50,4 +50,4 @@
                  android:contentDescription="@string/close_tab"
                  android:src="@drawable/tab_close"/>
 
-</Gecko.TabRow>
+</org.mozilla.gecko.widget.TabRow>
diff --git a/mobile/android/base/resources/layout/tabs_panel_header.xml b/mobile/android/base/resources/layout/tabs_panel_header.xml
index 36aff0cab5ad..2b3f3478913b 100644
--- a/mobile/android/base/resources/layout/tabs_panel_header.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_header.xml
@@ -5,11 +5,11 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <Gecko.IconTabWidget android:id="@+id/tab_widget"
-                         android:layout_width="wrap_content"
-                         android:layout_height="fill_parent"
-                         android:tabStripEnabled="false"
-                         android:divider="@drawable/tab_indicator_divider"/>
+    <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="fill_parent"
+                                            android:tabStripEnabled="false"
+                                            android:divider="@drawable/tab_indicator_divider"/>
 
     <View android:layout_width="0dip"
           android:layout_height="fill_parent"