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
2015-08-26 14:28:05 -07:00 · 2015-08-26 14:28:05 -07:00 · 3214532ac8
--- 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;
--- 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;
--- 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',
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 {
--- 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;
--- 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;
--- 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;
--- 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,
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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
--- 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
--- 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 {
--- 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
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/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;
--- a/mobile/android/base/widget/themed/generate_themed_views.py
+++ b/mobile/android/base/widget/themed/generate_themed_views.py