From 3214532ac86520ef73bb6e400a642c7057f2cb4e Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 26 Aug 2015 14:28:05 -0700
Subject: [PATCH] Bug 1105563 - Move Themed* to widget.themed package.
 r=nalexander

--HG--
rename : mobile/android/base/widget/ThemedEditText.java => mobile/android/base/widget/themed/ThemedEditText.java
rename : mobile/android/base/widget/ThemedFrameLayout.java => mobile/android/base/widget/themed/ThemedFrameLayout.java
rename : mobile/android/base/widget/ThemedImageButton.java => mobile/android/base/widget/themed/ThemedImageButton.java
rename : mobile/android/base/widget/ThemedImageView.java => mobile/android/base/widget/themed/ThemedImageView.java
rename : mobile/android/base/widget/ThemedLinearLayout.java => mobile/android/base/widget/themed/ThemedLinearLayout.java
rename : mobile/android/base/widget/ThemedRelativeLayout.java => mobile/android/base/widget/themed/ThemedRelativeLayout.java
rename : mobile/android/base/widget/ThemedTextSwitcher.java => mobile/android/base/widget/themed/ThemedTextSwitcher.java
rename : mobile/android/base/widget/ThemedTextView.java => mobile/android/base/widget/themed/ThemedTextView.java
rename : mobile/android/base/widget/ThemedView.java => mobile/android/base/widget/themed/ThemedView.java
rename : mobile/android/base/widget/ThemedView.java.frag => mobile/android/base/widget/themed/ThemedView.java.frag
rename : mobile/android/base/widget/generate_themed_views.py => mobile/android/base/widget/themed/generate_themed_views.py
extra : commitid : Hxqk5cim4os
extra : rebase_source : 84565ed3333657f00bc19f46919f47c19a30dd8a
---
 mobile/android/base/CustomEditText.java       |  2 +-
 .../android/base/menu/MenuItemActionBar.java  |  3 +--
 mobile/android/base/moz.build                 | 22 +++++++++----------
 .../layout-large-v11/browser_toolbar.xml      |  8 +++----
 .../layout-large-v11/tab_strip_inner.xml      |  2 +-
 .../layout-large-v11/tab_strip_item_view.xml  |  4 ++--
 .../layout-large-v11/tabs_counter.xml         |  2 +-
 .../base/resources/layout/browser_toolbar.xml |  4 ++--
 .../base/resources/layout/tabs_counter.xml    |  2 +-
 .../resources/layout/tabs_panel_indicator.xml |  2 +-
 mobile/android/base/tabs/TabStrip.java        |  4 ++--
 .../android/base/tabs/TabStripItemView.java   |  6 ++---
 mobile/android/base/tabs/TabsGridLayout.java  |  2 +-
 mobile/android/base/tabs/TabsListLayout.java  |  2 +-
 mobile/android/base/tabs/TabsPanel.java       |  3 +--
 .../android/base/toolbar/BrowserToolbar.java  |  6 ++---
 .../base/toolbar/BrowserToolbarPhoneBase.java |  2 +-
 .../toolbar/BrowserToolbarTabletBase.java     |  3 +--
 mobile/android/base/toolbar/ShapedButton.java |  6 +----
 mobile/android/base/toolbar/TabCounter.java   |  2 +-
 .../base/toolbar/ToolbarDisplayLayout.java    |  4 ++--
 .../base/toolbar/ToolbarEditLayout.java       |  5 +----
 .../base/toolbar/ToolbarProgressView.java     |  2 +-
 mobile/android/base/widget/CropImageView.java |  1 +
 mobile/android/base/widget/FadedTextView.java |  1 +
 .../base/widget/TabThumbnailWrapper.java      |  1 +
 mobile/android/base/widget/ThumbnailView.java |  2 +-
 .../widget/{ => themed}/ThemedEditText.java   |  2 +-
 .../{ => themed}/ThemedFrameLayout.java       |  2 +-
 .../{ => themed}/ThemedImageButton.java       |  2 +-
 .../widget/{ => themed}/ThemedImageView.java  |  2 +-
 .../{ => themed}/ThemedLinearLayout.java      |  2 +-
 .../{ => themed}/ThemedRelativeLayout.java    |  2 +-
 .../{ => themed}/ThemedTextSwitcher.java      |  2 +-
 .../widget/{ => themed}/ThemedTextView.java   |  2 +-
 .../base/widget/{ => themed}/ThemedView.java  |  2 +-
 .../widget/{ => themed}/ThemedView.java.frag  |  2 +-
 .../{ => themed}/generate_themed_views.py     |  0
 38 files changed, 58 insertions(+), 65 deletions(-)
 rename mobile/android/base/widget/{ => themed}/ThemedEditText.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedFrameLayout.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedImageButton.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedImageView.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedLinearLayout.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedRelativeLayout.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedTextSwitcher.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedTextView.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedView.java (99%)
 rename mobile/android/base/widget/{ => themed}/ThemedView.java.frag (99%)
 rename mobile/android/base/widget/{ => themed}/generate_themed_views.py (100%)

diff --git a/mobile/android/base/CustomEditText.java b/mobile/android/base/CustomEditText.java
index 23f8af545853..498e95081d6a 100644
--- a/mobile/android/base/CustomEditText.java
+++ b/mobile/android/base/CustomEditText.java
@@ -6,7 +6,7 @@
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.util.ColorUtils;
-import org.mozilla.gecko.widget.ThemedEditText;
+import org.mozilla.gecko.widget.themed.ThemedEditText;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/mobile/android/base/menu/MenuItemActionBar.java b/mobile/android/base/menu/MenuItemActionBar.java
index 3620e7de5cbf..46981d60beaa 100644
--- a/mobile/android/base/menu/MenuItemActionBar.java
+++ b/mobile/android/base/menu/MenuItemActionBar.java
@@ -5,8 +5,7 @@
 package org.mozilla.gecko.menu;
 
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.util.DrawableUtil;
-import org.mozilla.gecko.widget.ThemedImageButton;
+import org.mozilla.gecko.widget.themed.ThemedImageButton;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 1490a0715761..d0f7a93e1eaa 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -556,18 +556,18 @@ gbjar.sources += [
     'ZoomedView.java',
 ]
 # The following sources are checked in to version control but
-# generated by a script (widget/generate_themed_views.py).  If you're
-# editing this list, make sure to edit that script.
+# generated by a script (widget/themed/generate_themed_views.py).
+# If you're editing this list, make sure to edit that script.
 gbjar.sources += [
-    'widget/ThemedEditText.java',
-    'widget/ThemedFrameLayout.java',
-    'widget/ThemedImageButton.java',
-    'widget/ThemedImageView.java',
-    'widget/ThemedLinearLayout.java',
-    'widget/ThemedRelativeLayout.java',
-    'widget/ThemedTextSwitcher.java',
-    'widget/ThemedTextView.java',
-    'widget/ThemedView.java',
+    'widget/themed/ThemedEditText.java',
+    'widget/themed/ThemedFrameLayout.java',
+    'widget/themed/ThemedImageButton.java',
+    'widget/themed/ThemedImageView.java',
+    'widget/themed/ThemedLinearLayout.java',
+    'widget/themed/ThemedRelativeLayout.java',
+    'widget/themed/ThemedTextSwitcher.java',
+    'widget/themed/ThemedTextView.java',
+    'widget/themed/ThemedView.java',
 ]
 gbjar.sources += [ thirdparty_source_dir + f for f in [
     'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java',
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 6aaee8935fef..b69b1dd68ad6 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -90,7 +90,7 @@
                   android:orientation="horizontal"
                   android:layout_toLeftOf="@id/tabs"/>
 
-    <org.mozilla.gecko.widget.ThemedImageButton
+    <org.mozilla.gecko.widget.themed.ThemedImageButton
             android:id="@+id/tabs"
             style="@style/UrlBar.ImageButton"
             android:layout_toLeftOf="@id/menu"
@@ -109,7 +109,7 @@
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"/>
 
-    <org.mozilla.gecko.widget.ThemedImageButton
+    <org.mozilla.gecko.widget.themed.ThemedImageButton
             android:id="@+id/menu"
             style="@style/UrlBar.ImageButton"
             android:layout_alignParentRight="true"
@@ -118,7 +118,7 @@
             android:background="@drawable/browser_toolbar_action_bar_button"
             android:visibility="gone"/>
 
-    <org.mozilla.gecko.widget.ThemedImageView
+    <org.mozilla.gecko.widget.themed.ThemedImageView
             android:id="@+id/menu_icon"
             style="@style/UrlBar.ImageButton.BrowserToolbarColors"
             android:layout_alignLeft="@id/menu"
@@ -128,7 +128,7 @@
 
     <!-- We draw after the menu items so when they are hidden, the cancel button,
          which is thus drawn on top, may be pressed. -->
-    <org.mozilla.gecko.widget.ThemedImageView
+    <org.mozilla.gecko.widget.themed.ThemedImageView
             android:id="@+id/edit_cancel"
             style="@style/UrlBar.ImageButton.Icon"
             android:layout_alignParentRight="true"
diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml b/mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
index c18ccd44885d..61d4b24d4c72 100644
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
+++ b/mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
@@ -14,7 +14,7 @@
 
     <!-- The right margin creates a "dead area" on the right side of the button
          which we compensate for with a touch delegate. See TabStrip -->
-    <org.mozilla.gecko.widget.ThemedImageButton
+    <org.mozilla.gecko.widget.themed.ThemedImageButton
         android:id="@+id/add_tab"
         style="@style/UrlBar.ImageButton"
         android:layout_width="@dimen/tablet_tab_strip_height"
diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
index 03039e2b10f2..449f8c3e579c 100644
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
+++ b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
@@ -28,7 +28,7 @@
         gecko:fadeWidth="30dip"
         android:duplicateParentState="true"/>
 
-    <org.mozilla.gecko.widget.ThemedImageButton
+    <org.mozilla.gecko.widget.themed.ThemedImageButton
         android:id="@+id/audio_playing"
         android:visibility="gone"
         android:layout_width="20dip"
@@ -39,7 +39,7 @@
         android:contentDescription="@string/tab_audio_playing"
         android:src="@drawable/tab_audio_playing"/>
 
-    <org.mozilla.gecko.widget.ThemedImageButton
+    <org.mozilla.gecko.widget.themed.ThemedImageButton
         android:id="@+id/close"
         android:layout_width="40dip"
         android:layout_height="match_parent"
diff --git a/mobile/android/base/resources/layout-large-v11/tabs_counter.xml b/mobile/android/base/resources/layout-large-v11/tabs_counter.xml
index 24bd2a5e2a0c..df771a231778 100644
--- a/mobile/android/base/resources/layout-large-v11/tabs_counter.xml
+++ b/mobile/android/base/resources/layout-large-v11/tabs_counter.xml
@@ -3,7 +3,7 @@
    - 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.ThemedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.mozilla.gecko.widget.themed.ThemedTextView xmlns:android="http://schemas.android.com/apk/res/android"
                                          android:layout_width="24dip"
                                          android:layout_height="24dip"
                                          android:paddingTop="3dip"
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index 51f57c747dac..cd6a0635c95e 100644
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -43,7 +43,7 @@
                                             android:background="@drawable/shaped_button"
                                             android:visibility="gone"/>
 
-    <org.mozilla.gecko.widget.ThemedImageView android:id="@+id/menu_icon"
+    <org.mozilla.gecko.widget.themed.ThemedImageView android:id="@+id/menu_icon"
                                               style="@style/UrlBar.ImageButton"
                                               android:layout_alignLeft="@id/menu"
                                               android:layout_alignRight="@id/menu"
@@ -74,7 +74,7 @@
 
     <!-- Note that the edit components are invisible so that the views
          depending on their location can properly layout. -->
-    <org.mozilla.gecko.widget.ThemedImageView
+    <org.mozilla.gecko.widget.themed.ThemedImageView
             android:id="@+id/edit_cancel"
             style="@style/UrlBar.ImageButton"
             android:layout_alignParentRight="true"
diff --git a/mobile/android/base/resources/layout/tabs_counter.xml b/mobile/android/base/resources/layout/tabs_counter.xml
index 57ac5401c537..e410812513ab 100644
--- a/mobile/android/base/resources/layout/tabs_counter.xml
+++ b/mobile/android/base/resources/layout/tabs_counter.xml
@@ -3,7 +3,7 @@
    - 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.ThemedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.mozilla.gecko.widget.themed.ThemedTextView xmlns:android="http://schemas.android.com/apk/res/android"
                                          android:layout_width="24dip"
                                          android:layout_height="24dip"
                                          android:layout_margin="12dip"
diff --git a/mobile/android/base/resources/layout/tabs_panel_indicator.xml b/mobile/android/base/resources/layout/tabs_panel_indicator.xml
index 6b1aa9d3d549..64c9d4afc1b4 100644
--- a/mobile/android/base/resources/layout/tabs_panel_indicator.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_indicator.xml
@@ -3,7 +3,7 @@
    - 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.ThemedImageButton
+<org.mozilla.gecko.widget.themed.ThemedImageButton
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="@dimen/tabs_panel_indicator_width"
         android:layout_height="@dimen/browser_toolbar_height"
diff --git a/mobile/android/base/tabs/TabStrip.java b/mobile/android/base/tabs/TabStrip.java
index 4e438b28f9d3..c10ba371b562 100644
--- a/mobile/android/base/tabs/TabStrip.java
+++ b/mobile/android/base/tabs/TabStrip.java
@@ -20,8 +20,8 @@ import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.util.ColorUtils;
-import org.mozilla.gecko.widget.ThemedImageButton;
-import org.mozilla.gecko.widget.ThemedLinearLayout;
+import org.mozilla.gecko.widget.themed.ThemedImageButton;
+import org.mozilla.gecko.widget.themed.ThemedLinearLayout;
 
 public class TabStrip extends ThemedLinearLayout
                       implements Refreshable {
diff --git a/mobile/android/base/tabs/TabStripItemView.java b/mobile/android/base/tabs/TabStripItemView.java
index c54f051b18aa..dfe85341e0e0 100644
--- a/mobile/android/base/tabs/TabStripItemView.java
+++ b/mobile/android/base/tabs/TabStripItemView.java
@@ -13,9 +13,9 @@ import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.widget.ResizablePathDrawable;
 import org.mozilla.gecko.widget.ResizablePathDrawable.NonScaledPathShape;
-import org.mozilla.gecko.widget.ThemedImageButton;
-import org.mozilla.gecko.widget.ThemedLinearLayout;
-import org.mozilla.gecko.widget.ThemedTextView;
+import org.mozilla.gecko.widget.themed.ThemedImageButton;
+import org.mozilla.gecko.widget.themed.ThemedLinearLayout;
+import org.mozilla.gecko.widget.themed.ThemedTextView;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/mobile/android/base/tabs/TabsGridLayout.java b/mobile/android/base/tabs/TabsGridLayout.java
index 451272ba644b..df4190290436 100644
--- a/mobile/android/base/tabs/TabsGridLayout.java
+++ b/mobile/android/base/tabs/TabsGridLayout.java
@@ -13,7 +13,7 @@ import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
-import org.mozilla.gecko.widget.ThemedRelativeLayout;
+import org.mozilla.gecko.widget.themed.ThemedRelativeLayout;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 2e5a3ff36d00..9a132b564e52 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -18,7 +18,7 @@ import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.util.ThreadUtils;
-import org.mozilla.gecko.widget.ThemedRelativeLayout;
+import org.mozilla.gecko.widget.themed.ThemedRelativeLayout;
 import org.mozilla.gecko.widget.TwoWayView;
 
 import android.content.Context;
diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java
index a6783d392d54..89da05fcdba3 100644
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -26,7 +26,6 @@ import org.mozilla.gecko.widget.IconTabWidget;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -39,7 +38,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import org.mozilla.gecko.widget.ThemedImageButton;
+import org.mozilla.gecko.widget.themed.ThemedImageButton;
 
 public class TabsPanel extends LinearLayout
                        implements GeckoPopupMenu.OnMenuItemClickListener,
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index d2ed162dd165..818be78cef96 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -32,9 +32,9 @@ import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.ColorUtils;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.MenuUtils;
-import org.mozilla.gecko.widget.ThemedImageButton;
-import org.mozilla.gecko.widget.ThemedImageView;
-import org.mozilla.gecko.widget.ThemedRelativeLayout;
+import org.mozilla.gecko.widget.themed.ThemedImageButton;
+import org.mozilla.gecko.widget.themed.ThemedImageView;
+import org.mozilla.gecko.widget.themed.ThemedRelativeLayout;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
index 1e39cac6debc..117b133292d9 100644
--- a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
@@ -14,7 +14,7 @@ import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.util.ColorUtils;
-import org.mozilla.gecko.widget.ThemedImageView;
+import org.mozilla.gecko.widget.themed.ThemedImageView;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
index 0ba1e49e21cc..fb308db222d5 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
@@ -13,12 +13,11 @@ import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.tabs.TabHistoryController;
 import org.mozilla.gecko.menu.MenuItemActionBar;
 import org.mozilla.gecko.util.ColorUtils;
-import org.mozilla.gecko.widget.ThemedTextView;
+import org.mozilla.gecko.widget.themed.ThemedTextView;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
diff --git a/mobile/android/base/toolbar/ShapedButton.java b/mobile/android/base/toolbar/ShapedButton.java
index fb98a8b13fa6..e041708989a4 100644
--- a/mobile/android/base/toolbar/ShapedButton.java
+++ b/mobile/android/base/toolbar/ShapedButton.java
@@ -4,16 +4,12 @@
 
 package org.mozilla.gecko.toolbar;
 
-import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.lwt.LightweightTheme;
 import org.mozilla.gecko.lwt.LightweightThemeDrawable;
-import org.mozilla.gecko.tabs.TabCurve;
 import org.mozilla.gecko.util.ColorUtils;
-import org.mozilla.gecko.widget.ThemedImageButton;
+import org.mozilla.gecko.widget.themed.ThemedImageButton;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
diff --git a/mobile/android/base/toolbar/TabCounter.java b/mobile/android/base/toolbar/TabCounter.java
index 94e59e29276e..1e0ca516b430 100644
--- a/mobile/android/base/toolbar/TabCounter.java
+++ b/mobile/android/base/toolbar/TabCounter.java
@@ -8,7 +8,7 @@ package org.mozilla.gecko.toolbar;
 import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.animation.Rotate3DAnimation;
-import org.mozilla.gecko.widget.ThemedTextSwitcher;
+import org.mozilla.gecko.widget.themed.ThemedTextSwitcher;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/mobile/android/base/toolbar/ToolbarDisplayLayout.java b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
index bdafdf2a0af3..6cbf197b8b3d 100644
--- a/mobile/android/base/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
@@ -26,8 +26,8 @@ import org.mozilla.gecko.toolbar.BrowserToolbarTabletBase.ForwardButtonAnimation
 import org.mozilla.gecko.util.ColorUtils;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.StringUtils;
-import org.mozilla.gecko.widget.ThemedLinearLayout;
-import org.mozilla.gecko.widget.ThemedTextView;
+import org.mozilla.gecko.widget.themed.ThemedLinearLayout;
+import org.mozilla.gecko.widget.themed.ThemedTextView;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/mobile/android/base/toolbar/ToolbarEditLayout.java b/mobile/android/base/toolbar/ToolbarEditLayout.java
index cec9aa83139a..5140c88878bf 100644
--- a/mobile/android/base/toolbar/ToolbarEditLayout.java
+++ b/mobile/android/base/toolbar/ToolbarEditLayout.java
@@ -6,14 +6,11 @@
 package org.mozilla.gecko.toolbar;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.speech.RecognizerIntent;
 import android.widget.Button;
 import android.widget.ImageButton;
 import org.mozilla.gecko.ActivityHandlerHelper;
-import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.R;
@@ -29,7 +26,7 @@ import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState;
 import org.mozilla.gecko.util.ActivityResultHandler;
 import org.mozilla.gecko.util.StringUtils;
 import org.mozilla.gecko.util.InputOptionsUtils;
-import org.mozilla.gecko.widget.ThemedLinearLayout;
+import org.mozilla.gecko.widget.themed.ThemedLinearLayout;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/mobile/android/base/toolbar/ToolbarProgressView.java b/mobile/android/base/toolbar/ToolbarProgressView.java
index dce9dba91da9..babbfbd45a7c 100644
--- a/mobile/android/base/toolbar/ToolbarProgressView.java
+++ b/mobile/android/base/toolbar/ToolbarProgressView.java
@@ -19,7 +19,7 @@ package org.mozilla.gecko.toolbar;
 import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.util.ColorUtils;
-import org.mozilla.gecko.widget.ThemedImageView;
+import org.mozilla.gecko.widget.themed.ThemedImageView;
 import org.mozilla.gecko.util.WeakReferenceHandler;
 
 import android.content.Context;
diff --git a/mobile/android/base/widget/CropImageView.java b/mobile/android/base/widget/CropImageView.java
index 0c2cbcf7d0d6..b55716f0c7e2 100644
--- a/mobile/android/base/widget/CropImageView.java
+++ b/mobile/android/base/widget/CropImageView.java
@@ -13,6 +13,7 @@ import android.util.AttributeSet;
 import android.widget.ImageView;
 
 import com.nineoldandroids.view.ViewHelper;
+import org.mozilla.gecko.widget.themed.ThemedImageView;
 
 /**
  * An ImageView which will always display at the given width and calculated height (based on the width and
diff --git a/mobile/android/base/widget/FadedTextView.java b/mobile/android/base/widget/FadedTextView.java
index 79dee7ea2186..e10433083208 100644
--- a/mobile/android/base/widget/FadedTextView.java
+++ b/mobile/android/base/widget/FadedTextView.java
@@ -11,6 +11,7 @@ import android.text.Layout;
 import android.util.AttributeSet;
 
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.widget.themed.ThemedTextView;
 
 /**
  * An implementation of FadedTextView should fade the end of the text
diff --git a/mobile/android/base/widget/TabThumbnailWrapper.java b/mobile/android/base/widget/TabThumbnailWrapper.java
index 928a61606fd1..848e2f6ed1f6 100644
--- a/mobile/android/base/widget/TabThumbnailWrapper.java
+++ b/mobile/android/base/widget/TabThumbnailWrapper.java
@@ -3,6 +3,7 @@ package org.mozilla.gecko.widget;
 import android.content.Context;
 import android.util.AttributeSet;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.widget.themed.ThemedRelativeLayout;
 
 
 public class TabThumbnailWrapper extends ThemedRelativeLayout {
diff --git a/mobile/android/base/widget/ThumbnailView.java b/mobile/android/base/widget/ThumbnailView.java
index 80fb89846f77..f3ecf561085c 100644
--- a/mobile/android/base/widget/ThumbnailView.java
+++ b/mobile/android/base/widget/ThumbnailView.java
@@ -13,7 +13,7 @@ import android.graphics.Matrix;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.support.v4.content.ContextCompat;
-import android.widget.ImageView;
+import org.mozilla.gecko.widget.themed.ThemedImageView;
 
 /* Special version of ImageView for thumbnails. Scales a thumbnail so that it maintains its aspect
  * ratio and so that the images width and height are the same size or greater than the view size
diff --git a/mobile/android/base/widget/ThemedEditText.java b/mobile/android/base/widget/themed/ThemedEditText.java
similarity index 99%
rename from mobile/android/base/widget/ThemedEditText.java
rename to mobile/android/base/widget/themed/ThemedEditText.java
index 207ebde11a43..5049bb26e003 100644
--- a/mobile/android/base/widget/ThemedEditText.java
+++ b/mobile/android/base/widget/themed/ThemedEditText.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedFrameLayout.java b/mobile/android/base/widget/themed/ThemedFrameLayout.java
similarity index 99%
rename from mobile/android/base/widget/ThemedFrameLayout.java
rename to mobile/android/base/widget/themed/ThemedFrameLayout.java
index 5ecd594ab057..38fbc75ec109 100644
--- a/mobile/android/base/widget/ThemedFrameLayout.java
+++ b/mobile/android/base/widget/themed/ThemedFrameLayout.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedImageButton.java b/mobile/android/base/widget/themed/ThemedImageButton.java
similarity index 99%
rename from mobile/android/base/widget/ThemedImageButton.java
rename to mobile/android/base/widget/themed/ThemedImageButton.java
index 74894357c2b9..73a78b66f073 100644
--- a/mobile/android/base/widget/ThemedImageButton.java
+++ b/mobile/android/base/widget/themed/ThemedImageButton.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedImageView.java b/mobile/android/base/widget/themed/ThemedImageView.java
similarity index 99%
rename from mobile/android/base/widget/ThemedImageView.java
rename to mobile/android/base/widget/themed/ThemedImageView.java
index f35aa712fb22..48b392db90c4 100644
--- a/mobile/android/base/widget/ThemedImageView.java
+++ b/mobile/android/base/widget/themed/ThemedImageView.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedLinearLayout.java b/mobile/android/base/widget/themed/ThemedLinearLayout.java
similarity index 99%
rename from mobile/android/base/widget/ThemedLinearLayout.java
rename to mobile/android/base/widget/themed/ThemedLinearLayout.java
index 23d01d21eeaf..9ae899dcb936 100644
--- a/mobile/android/base/widget/ThemedLinearLayout.java
+++ b/mobile/android/base/widget/themed/ThemedLinearLayout.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedRelativeLayout.java b/mobile/android/base/widget/themed/ThemedRelativeLayout.java
similarity index 99%
rename from mobile/android/base/widget/ThemedRelativeLayout.java
rename to mobile/android/base/widget/themed/ThemedRelativeLayout.java
index 33c1e4117350..36f31c932b45 100644
--- a/mobile/android/base/widget/ThemedRelativeLayout.java
+++ b/mobile/android/base/widget/themed/ThemedRelativeLayout.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedTextSwitcher.java b/mobile/android/base/widget/themed/ThemedTextSwitcher.java
similarity index 99%
rename from mobile/android/base/widget/ThemedTextSwitcher.java
rename to mobile/android/base/widget/themed/ThemedTextSwitcher.java
index 1fb2b12b01fc..e745fff72c43 100644
--- a/mobile/android/base/widget/ThemedTextSwitcher.java
+++ b/mobile/android/base/widget/themed/ThemedTextSwitcher.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedTextView.java b/mobile/android/base/widget/themed/ThemedTextView.java
similarity index 99%
rename from mobile/android/base/widget/ThemedTextView.java
rename to mobile/android/base/widget/themed/ThemedTextView.java
index 15011318d6ef..1e66abd63f77 100644
--- a/mobile/android/base/widget/ThemedTextView.java
+++ b/mobile/android/base/widget/themed/ThemedTextView.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedView.java b/mobile/android/base/widget/themed/ThemedView.java
similarity index 99%
rename from mobile/android/base/widget/ThemedView.java
rename to mobile/android/base/widget/themed/ThemedView.java
index b99271d9084a..138b4d369051 100644
--- a/mobile/android/base/widget/ThemedView.java
+++ b/mobile/android/base/widget/themed/ThemedView.java
@@ -4,7 +4,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/ThemedView.java.frag b/mobile/android/base/widget/themed/ThemedView.java.frag
similarity index 99%
rename from mobile/android/base/widget/ThemedView.java.frag
rename to mobile/android/base/widget/themed/ThemedView.java.frag
index 50f94c5bad2c..62572a214d6c 100644
--- a/mobile/android/base/widget/ThemedView.java.frag
+++ b/mobile/android/base/widget/themed/ThemedView.java.frag
@@ -5,7 +5,7 @@
  * 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.widget;
+package org.mozilla.gecko.widget.themed;
 
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.lwt.LightweightTheme;
diff --git a/mobile/android/base/widget/generate_themed_views.py b/mobile/android/base/widget/themed/generate_themed_views.py
similarity index 100%
rename from mobile/android/base/widget/generate_themed_views.py
rename to mobile/android/base/widget/themed/generate_themed_views.py