Bug 991256 - Rename preprocessed Gecko* -> Themed* in widget/. r=bnicholson
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 02 Apr 2014 15:56:52 -0700
changeset 195351 46cf0150b59e6b8f20c079125e48540ca89b4e92
parent 195350 e66a1ef084bfb3f7062cd4a654a8ad4cce073d07
child 195352 688cdd76968dc107907498f84a989503985e357c
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbnicholson
bugs991256
milestone31.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 991256 - Rename preprocessed Gecko* -> Themed* in widget/. r=bnicholson
CLOBBER
mobile/android/base/CustomEditText.java
mobile/android/base/moz.build
mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
mobile/android/base/resources/layout/browser_toolbar.xml
mobile/android/base/resources/layout/tabs_counter.xml
mobile/android/base/resources/layout/toolbar_display_layout.xml
mobile/android/base/toolbar/BrowserToolbar.java
mobile/android/base/toolbar/ShapedButton.java
mobile/android/base/toolbar/TabCounter.java
mobile/android/base/toolbar/ToolbarDisplayLayout.java
mobile/android/base/toolbar/ToolbarEditLayout.java
mobile/android/base/widget/GeckoEditText.java.in
mobile/android/base/widget/GeckoImageButton.java.in
mobile/android/base/widget/GeckoImageView.java.in
mobile/android/base/widget/GeckoLinearLayout.java.in
mobile/android/base/widget/GeckoRelativeLayout.java.in
mobile/android/base/widget/GeckoTextSwitcher.java.in
mobile/android/base/widget/GeckoTextView.java.in
mobile/android/base/widget/GeckoView.java.frag
mobile/android/base/widget/ThemedEditText.java.in
mobile/android/base/widget/ThemedImageButton.java.in
mobile/android/base/widget/ThemedImageView.java.in
mobile/android/base/widget/ThemedLinearLayout.java.in
mobile/android/base/widget/ThemedRelativeLayout.java.in
mobile/android/base/widget/ThemedTextSwitcher.java.in
mobile/android/base/widget/ThemedTextView.java.in
mobile/android/base/widget/ThemedView.java.frag
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 988168 requires a clobber because of the location change for the linked libxul.
+Bug 991256 requires a clobber because it renames generated mobile/android/base/widget files.
--- a/mobile/android/base/CustomEditText.java
+++ b/mobile/android/base/CustomEditText.java
@@ -1,23 +1,23 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko;
 
-import org.mozilla.gecko.widget.GeckoEditText;
+import org.mozilla.gecko.widget.ThemedEditText;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
 
-public class CustomEditText extends GeckoEditText {
+public class CustomEditText extends ThemedEditText {
     private OnKeyPreImeListener mOnKeyPreImeListener;
     private OnSelectionChangedListener mOnSelectionChangedListener;
     private OnWindowFocusChangeListener mOnWindowFocusChangeListener;
 
     public CustomEditText(Context context, AttributeSet attrs) {
         super(context, attrs);
         mOnKeyPreImeListener = null;
     }
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -419,23 +419,23 @@ android_package_dir = CONFIG['ANDROID_PA
 gbjar.generated_sources += [ android_package_dir + f for f in [
     '/App.java',
     '/Webapp.java',
     '/WebApps.java',
 ] ]
 gbjar.generated_sources += [
     'org/mozilla/gecko/AppConstants.java',
     'org/mozilla/gecko/SysInfo.java',
-    'org/mozilla/gecko/widget/GeckoEditText.java',
-    'org/mozilla/gecko/widget/GeckoImageButton.java',
-    'org/mozilla/gecko/widget/GeckoImageView.java',
-    'org/mozilla/gecko/widget/GeckoLinearLayout.java',
-    'org/mozilla/gecko/widget/GeckoRelativeLayout.java',
-    'org/mozilla/gecko/widget/GeckoTextSwitcher.java',
-    'org/mozilla/gecko/widget/GeckoTextView.java',
+    'org/mozilla/gecko/widget/ThemedEditText.java',
+    'org/mozilla/gecko/widget/ThemedImageButton.java',
+    'org/mozilla/gecko/widget/ThemedImageView.java',
+    'org/mozilla/gecko/widget/ThemedLinearLayout.java',
+    'org/mozilla/gecko/widget/ThemedRelativeLayout.java',
+    'org/mozilla/gecko/widget/ThemedTextSwitcher.java',
+    'org/mozilla/gecko/widget/ThemedTextView.java',
 ]
 if CONFIG['MOZ_CRASHREPORTER']:
     gbjar.sources += [ 'CrashReporter.java' ]
     ANDROID_RES_DIRS += [ SRCDIR + '/crashreporter/res' ]
 
 gbjar.sources += sync_java_files
 gbjar.generated_sources += sync_generated_java_files
 gbjar.extra_jars = [
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -77,31 +77,31 @@
     <LinearLayout android:id="@+id/menu_items"
                   android:layout_width="wrap_content"
                   android:layout_height="fill_parent"
                   android:layout_marginLeft="3dp"
                   android:orientation="horizontal"
                   android:layout_toLeftOf="@id/menu"
                   android:layout_alignWithParentIfMissing="true"/>
 
-    <org.mozilla.gecko.widget.GeckoImageButton android:id="@+id/menu"
-                                               style="@style/UrlBar.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.widget.ThemedImageButton android:id="@+id/menu"
+                                                style="@style/UrlBar.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.widget.GeckoImageView android:id="@+id/menu_icon"
-                                             style="@style/UrlBar.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.widget.ThemedImageView android:id="@+id/menu_icon"
+                                              style="@style/UrlBar.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"
                android:layout_height="2dp"
                android:layout_alignParentBottom="true"
                android:background="@color/url_bar_shadow"
                android:contentDescription="@null"/>
 
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -47,23 +47,23 @@
     <org.mozilla.gecko.toolbar.ShapedButton android:id="@+id/menu"
                                             style="@style/UrlBar.ImageButton"
                                             android:layout_width="48dip"
                                             android:layout_alignParentRight="true"
                                             android:contentDescription="@string/menu"
                                             android:background="@drawable/shaped_button"
                                             android:visibility="gone"/>
 
-    <org.mozilla.gecko.widget.GeckoImageView android:id="@+id/menu_icon"
-                                             style="@style/UrlBar.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.widget.ThemedImageView android:id="@+id/menu_icon"
+                                              style="@style/UrlBar.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.toolbar.ShapedButton android:id="@+id/tabs"
                                             style="@style/UrlBar.ImageButton"
                                             android:layout_width="72dip"
                                             android:layout_toLeftOf="@id/menu"
                                             android:layout_alignWithParentIfMissing="true"
                                             gecko:curveTowards="right"
                                             android:background="@drawable/shaped_button"
--- a/mobile/android/base/resources/layout/tabs_counter.xml
+++ b/mobile/android/base/resources/layout/tabs_counter.xml
@@ -1,17 +1,17 @@
 <?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/. -->
 
-<org.mozilla.gecko.widget.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"/>
+<org.mozilla.gecko.widget.ThemedTextView 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"/>
--- a/mobile/android/base/resources/layout/toolbar_display_layout.xml
+++ b/mobile/android/base/resources/layout/toolbar_display_layout.xml
@@ -20,29 +20,29 @@
                  style="@style/UrlBar.ImageButton"
                  android:layout_width="@dimen/browser_toolbar_lock_width"
                  android:scaleType="fitCenter"
                  android:layout_marginLeft="-4dip"
                  android:src="@drawable/site_security_level"
                  android:contentDescription="@string/site_security"
                  android:visibility="gone"/>
 
-    <org.mozilla.gecko.widget.GeckoTextView android:id="@+id/url_bar_title"
-                                            style="@style/UrlBar.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/url_bar_title"
-                                            android:textColorHint="@color/url_bar_title_hint"
-                                            android:gravity="center_vertical|left"
-                                            android:hint="@string/url_bar_default_text"
-                                            android:layout_gravity="center_vertical"
-                                            gecko:autoUpdateTheme="false"/>
+    <org.mozilla.gecko.widget.ThemedTextView android:id="@+id/url_bar_title"
+                                             style="@style/UrlBar.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/url_bar_title"
+                                             android:textColorHint="@color/url_bar_title_hint"
+                                             android:gravity="center_vertical|left"
+                                             android:hint="@string/url_bar_default_text"
+                                             android:layout_gravity="center_vertical"
+                                             gecko:autoUpdateTheme="false"/>
 
     <org.mozilla.gecko.toolbar.PageActionLayout android:id="@+id/page_action_layout"
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="match_parent"
                                                 android:layout_marginRight="@dimen/browser_toolbar_button_padding"
                                                 android:visibility="gone"
                                                 android:orientation="horizontal"/>
 
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -26,19 +26,19 @@ import org.mozilla.gecko.menu.GeckoMenu;
 import org.mozilla.gecko.menu.MenuPopup;
 import org.mozilla.gecko.toolbar.ToolbarDisplayLayout.OnStopListener;
 import org.mozilla.gecko.toolbar.ToolbarDisplayLayout.OnTitleChangeListener;
 import org.mozilla.gecko.toolbar.ToolbarDisplayLayout.UpdateFlags;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.MenuUtils;
-import org.mozilla.gecko.widget.GeckoImageButton;
-import org.mozilla.gecko.widget.GeckoImageView;
-import org.mozilla.gecko.widget.GeckoRelativeLayout;
+import org.mozilla.gecko.widget.ThemedImageButton;
+import org.mozilla.gecko.widget.ThemedImageView;
+import org.mozilla.gecko.widget.ThemedRelativeLayout;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -70,17 +70,17 @@ import android.widget.PopupWindow;
 * It has two states, display and edit, which are controlled by
 * ToolbarEditLayout and ToolbarDisplayLayout. In display state, the toolbar
 * displays the current state for the selected tab. In edit state, it shows
 * a text entry for searching bookmarks/history. {@code BrowserToolbar}
 * provides public API to enter, cancel, and commit the edit state as well
 * as a set of listeners to allow {@code BrowserToolbar} users to react
 * to state changes accordingly.
 */
-public class BrowserToolbar extends GeckoRelativeLayout
+public class BrowserToolbar extends ThemedRelativeLayout
                             implements Tabs.OnTabsChangedListener,
                                        GeckoMenu.ActionItemBarPresenter,
                                        GeckoEventListener {
     private static final String LOGTAG = "GeckoToolbar";
 
     public interface OnActivateListener {
         public void onActivate();
     }
@@ -121,18 +121,18 @@ public class BrowserToolbar extends Geck
     private ImageView mUrlBarRightEdge;
     private boolean mSwitchingTabs;
     private ShapedButton mTabs;
     private ImageButton mBack;
     private ImageButton mForward;
 
     private ToolbarProgressView mProgressBar;
     private TabCounter mTabsCounter;
-    private GeckoImageButton mMenu;
-    private GeckoImageView mMenuIcon;
+    private ThemedImageButton mMenu;
+    private ThemedImageView mMenuIcon;
     private LinearLayout mActionItemBar;
     private MenuPopup mMenuPopup;
     private List<View> mFocusOrder;
 
     private OnActivateListener mActivateListener;
     private OnCommitListener mCommitListener;
     private OnDismissListener mDismissListener;
     private OnFilterListener mFilterListener;
@@ -197,18 +197,18 @@ public class BrowserToolbar extends Geck
             mTabsCounter.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         }
 
         mBack = (ImageButton) findViewById(R.id.back);
         setButtonEnabled(mBack, false);
         mForward = (ImageButton) findViewById(R.id.forward);
         setButtonEnabled(mForward, false);
 
-        mMenu = (GeckoImageButton) findViewById(R.id.menu);
-        mMenuIcon = (GeckoImageView) findViewById(R.id.menu_icon);
+        mMenu = (ThemedImageButton) findViewById(R.id.menu);
+        mMenuIcon = (ThemedImageView) findViewById(R.id.menu_icon);
         mActionItemBar = (LinearLayout) findViewById(R.id.menu_items);
         mHasSoftMenuButton = !HardwareUtils.hasMenuButton();
 
         // We use different layouts on phones and tablets, so adjust the focus
         // order appropriately.
         mFocusOrder = new ArrayList<View>();
         if (HardwareUtils.isTablet()) {
             mFocusOrder.addAll(Arrays.asList(mTabs, mBack, mForward, this));
--- a/mobile/android/base/toolbar/ShapedButton.java
+++ b/mobile/android/base/toolbar/ShapedButton.java
@@ -3,28 +3,28 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.toolbar;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.LightweightThemeDrawable;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.widget.GeckoImageButton;
+import org.mozilla.gecko.widget.ThemedImageButton;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.util.AttributeSet;
 
-public class ShapedButton extends GeckoImageButton
+public class ShapedButton extends ThemedImageButton
                           implements CanvasDelegate.DrawManager {
     protected final LightweightTheme mTheme;
 
     private final Path mPath;
     private final CurveTowards mSide;
 
     protected final CanvasDelegate mCanvasDelegate;
 
--- a/mobile/android/base/toolbar/TabCounter.java
+++ b/mobile/android/base/toolbar/TabCounter.java
@@ -2,30 +2,30 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.toolbar;
 
 import org.mozilla.gecko.animation.Rotate3DAnimation;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.widget.GeckoTextSwitcher;
+import org.mozilla.gecko.widget.ThemedTextSwitcher;
 
 import android.content.Context;
 import android.os.Build;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.Animation;
 import android.view.animation.AnimationSet;
 import android.view.animation.AlphaAnimation;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.util.AttributeSet;
 import android.widget.ViewSwitcher;
 
-public class TabCounter extends GeckoTextSwitcher
+public class TabCounter extends ThemedTextSwitcher
                         implements ViewSwitcher.ViewFactory {
 
     private static final float CENTER_X = 0.5f;
     private static final float CENTER_Y = 1.25f;
     private static final int DURATION = 500;
     private static final float Z_DISTANCE = 200;
 
     private final AnimationSet mFlipInForward;
--- a/mobile/android/base/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
@@ -11,18 +11,18 @@ import org.mozilla.gecko.animation.ViewH
 import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.SiteIdentity;
 import org.mozilla.gecko.SiteIdentity.SecurityMode;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.toolbar.BrowserToolbar.ForwardButtonAnimation;
 import org.mozilla.gecko.util.StringUtils;
-import org.mozilla.gecko.widget.GeckoLinearLayout;
-import org.mozilla.gecko.widget.GeckoTextView;
+import org.mozilla.gecko.widget.ThemedLinearLayout;
+import org.mozilla.gecko.widget.ThemedTextView;
 
 import org.json.JSONObject;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.SystemClock;
@@ -57,17 +57,17 @@ import java.util.List;
 * The UI has two possible modes: progress and display which are triggered
 * when UpdateFlags.PROGRESS is used depending on the current tab state.
 * The progress mode is triggered when the tab is loading a page. Display mode
 * is used otherwise.
 *
 * {@code ToolbarDisplayLayout} is meant to be owned by {@code BrowserToolbar}
 * which is the main event bus for the toolbar subsystem.
 */
-public class ToolbarDisplayLayout extends GeckoLinearLayout
+public class ToolbarDisplayLayout extends ThemedLinearLayout
                                   implements Animation.AnimationListener {
 
     private static final String LOGTAG = "GeckoToolbarDisplayLayout";
 
     // To be used with updateFromTab() to allow the caller
     // to give enough context for the requested state change.
     enum UpdateFlags {
         TITLE,
@@ -94,17 +94,17 @@ public class ToolbarDisplayLayout extend
     interface OnTitleChangeListener {
         public void onTitleChange(CharSequence title);
     }
 
     final private BrowserApp mActivity;
 
     private UIMode mUiMode;
 
-    private GeckoTextView mTitle;
+    private ThemedTextView mTitle;
     private int mTitlePadding;
     private ToolbarTitlePrefs mTitlePrefs;
     private OnTitleChangeListener mTitleChangeListener;
 
     private ImageButton mSiteSecurity;
     private boolean mSiteSecurityVisible;
 
     // To de-bounce sets.
@@ -134,17 +134,17 @@ public class ToolbarDisplayLayout extend
     public ToolbarDisplayLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         setOrientation(HORIZONTAL);
 
         mActivity = (BrowserApp) context;
 
         LayoutInflater.from(context).inflate(R.layout.toolbar_display_layout, this);
 
-        mTitle = (GeckoTextView) findViewById(R.id.url_bar_title);
+        mTitle = (ThemedTextView) findViewById(R.id.url_bar_title);
         mTitlePadding = mTitle.getPaddingRight();
 
         final Resources res = getResources();
 
         mUrlColor = new ForegroundColorSpan(res.getColor(R.color.url_bar_urltext));
         mBlockedColor = new ForegroundColorSpan(res.getColor(R.color.url_bar_blockedtext));
         mDomainColor = new ForegroundColorSpan(res.getColor(R.color.url_bar_domaintext));
         mPrivateDomainColor = new ForegroundColorSpan(res.getColor(R.color.url_bar_domaintext_private));
--- a/mobile/android/base/toolbar/ToolbarEditLayout.java
+++ b/mobile/android/base/toolbar/ToolbarEditLayout.java
@@ -9,34 +9,34 @@ import org.mozilla.gecko.R;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.PropertyAnimator.PropertyAnimationListener;
 import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.toolbar.BrowserToolbar.OnCommitListener;
 import org.mozilla.gecko.toolbar.BrowserToolbar.OnDismissListener;
 import org.mozilla.gecko.toolbar.BrowserToolbar.OnFilterListener;
 import org.mozilla.gecko.toolbar.ToolbarEditText.OnTextTypeChangeListener;
 import org.mozilla.gecko.toolbar.ToolbarEditText.TextType;
-import org.mozilla.gecko.widget.GeckoLinearLayout;
+import org.mozilla.gecko.widget.ThemedLinearLayout;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageButton;
 
 /**
 * {@code ToolbarEditLayout} is the UI for when the toolbar is in
 * edit state. It controls a text entry ({@code ToolbarEditText})
 * and its matching 'go' button which changes depending on the
 * current type of text in the entry.
 */
-public class ToolbarEditLayout extends GeckoLinearLayout {
+public class ToolbarEditLayout extends ThemedLinearLayout {
 
     private final ToolbarEditText mEditText;
     private final ImageButton mGo;
 
     private OnCommitListener mCommitListener;
     private OnFocusChangeListener mFocusChangeListener;
 
     public ToolbarEditLayout(Context context, AttributeSet attrs) {
rename from mobile/android/base/widget/GeckoEditText.java.in
rename to mobile/android/base/widget/ThemedEditText.java.in
--- a/mobile/android/base/widget/GeckoEditText.java.in
+++ b/mobile/android/base/widget/ThemedEditText.java.in
@@ -1,3 +1,3 @@
 #filter substitution
 #define VIEWTYPE EditText
-#include GeckoView.java.frag
+#include ThemedView.java.frag
rename from mobile/android/base/widget/GeckoImageButton.java.in
rename to mobile/android/base/widget/ThemedImageButton.java.in
--- a/mobile/android/base/widget/GeckoImageButton.java.in
+++ b/mobile/android/base/widget/ThemedImageButton.java.in
@@ -1,3 +1,3 @@
 #filter substitution
 #define VIEWTYPE ImageButton
-#include GeckoView.java.frag
+#include ThemedView.java.frag
rename from mobile/android/base/widget/GeckoImageView.java.in
rename to mobile/android/base/widget/ThemedImageView.java.in
--- a/mobile/android/base/widget/GeckoImageView.java.in
+++ b/mobile/android/base/widget/ThemedImageView.java.in
@@ -1,3 +1,3 @@
 #filter substitution
 #define VIEWTYPE ImageView
-#include GeckoView.java.frag
+#include ThemedView.java.frag
rename from mobile/android/base/widget/GeckoLinearLayout.java.in
rename to mobile/android/base/widget/ThemedLinearLayout.java.in
--- a/mobile/android/base/widget/GeckoLinearLayout.java.in
+++ b/mobile/android/base/widget/ThemedLinearLayout.java.in
@@ -1,3 +1,3 @@
 #filter substitution
 #define VIEWTYPE LinearLayout
-#include GeckoView.java.frag
+#include ThemedView.java.frag
rename from mobile/android/base/widget/GeckoRelativeLayout.java.in
rename to mobile/android/base/widget/ThemedRelativeLayout.java.in
--- a/mobile/android/base/widget/GeckoRelativeLayout.java.in
+++ b/mobile/android/base/widget/ThemedRelativeLayout.java.in
@@ -1,3 +1,3 @@
 #filter substitution
 #define VIEWTYPE RelativeLayout
-#include GeckoView.java.frag
+#include ThemedView.java.frag
rename from mobile/android/base/widget/GeckoTextSwitcher.java.in
rename to mobile/android/base/widget/ThemedTextSwitcher.java.in
--- a/mobile/android/base/widget/GeckoTextSwitcher.java.in
+++ b/mobile/android/base/widget/ThemedTextSwitcher.java.in
@@ -1,3 +1,3 @@
 #filter substitution
 #define VIEWTYPE TextSwitcher
-#include GeckoView.java.frag
+#include ThemedView.java.frag
rename from mobile/android/base/widget/GeckoTextView.java.in
rename to mobile/android/base/widget/ThemedTextView.java.in
--- a/mobile/android/base/widget/GeckoTextView.java.in
+++ b/mobile/android/base/widget/ThemedTextView.java.in
@@ -1,3 +1,3 @@
 #filter substitution
 #define VIEWTYPE TextView
-#include GeckoView.java.frag
+#include ThemedView.java.frag
rename from mobile/android/base/widget/GeckoView.java.frag
rename to mobile/android/base/widget/ThemedView.java.frag
--- a/mobile/android/base/widget/GeckoView.java.frag
+++ b/mobile/android/base/widget/ThemedView.java.frag
@@ -9,34 +9,34 @@ import org.mozilla.gecko.LightweightThem
 import org.mozilla.gecko.R;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.ColorDrawable;
 import android.util.AttributeSet;
 import android.widget.@VIEWTYPE@;
 
-public class Gecko@VIEWTYPE@ extends @VIEWTYPE@
-                             implements LightweightTheme.OnChangeListener { 
+public class Themed@VIEWTYPE@ extends @VIEWTYPE@
+                              implements LightweightTheme.OnChangeListener {
     private final LightweightTheme mTheme;
 
     private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
     private static final int[] STATE_LIGHT = { R.attr.state_light };
     private static final int[] STATE_DARK = { R.attr.state_dark };
 
     protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
     protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
     protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
 
     private boolean mIsPrivate = false;
     private boolean mIsLight = false;
     private boolean mIsDark = false;
     private boolean mAutoUpdateTheme = true;
 
-    public Gecko@VIEWTYPE@(Context context, AttributeSet attrs) {
+    public Themed@VIEWTYPE@(Context context, AttributeSet attrs) {
         super(context, attrs);
         mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
 
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
         mAutoUpdateTheme = a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
         a.recycle();
     }