Bug 1080326 - Move Search Activity resources and stop building org.mozilla.search.R. r=rnewman
authorNick Alexander <nalexander@mozilla.com>
Wed, 08 Oct 2014 21:07:41 -0700
changeset 209478 43f52d151b2c607f762af548342862d9965a041a
parent 209477 dcb04b36ad6054533536249c70e70af25ce8bd89
child 209479 125453eb266c1e2d888c3470c6a3b39cb166a415
child 209694 95d1486223f7c222b70f6878348ea0be3a66b821
push id9244
push usernalexander@mozilla.com
push dateThu, 09 Oct 2014 04:08:05 +0000
treeherderfx-team@43f52d151b2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs1080326
milestone35.0a1
Bug 1080326 - Move Search Activity resources and stop building org.mozilla.search.R. r=rnewman Since we no longer build the Search Activity stand-alone, we don't need the complication of the extra search-only resources package. Without the stand-alone build and repository, the probability of search resources being added to the Fennec resources (or being used in both places) approaches 1, so lets protect against that.
mobile/android/base/Makefile.in
mobile/android/base/moz.build
mobile/android/base/resources/color/facet_button_text_color.xml
mobile/android/base/resources/drawable-hdpi/ic_action_settings.png
mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.png
mobile/android/base/resources/drawable-hdpi/ic_widget_search.png
mobile/android/base/resources/drawable-hdpi/network_error.png
mobile/android/base/resources/drawable-hdpi/search_clear.png
mobile/android/base/resources/drawable-hdpi/search_fox.png
mobile/android/base/resources/drawable-hdpi/search_history.png
mobile/android/base/resources/drawable-hdpi/search_icon_active.png
mobile/android/base/resources/drawable-hdpi/search_icon_inactive.png
mobile/android/base/resources/drawable-hdpi/search_launcher.png
mobile/android/base/resources/drawable-hdpi/search_plus.png
mobile/android/base/resources/drawable-hdpi/widget_bg.9.png
mobile/android/base/resources/drawable-mdpi/ic_action_settings.png
mobile/android/base/resources/drawable-mdpi/ic_widget_new_tab.png
mobile/android/base/resources/drawable-mdpi/ic_widget_search.png
mobile/android/base/resources/drawable-mdpi/network_error.png
mobile/android/base/resources/drawable-mdpi/search_clear.png
mobile/android/base/resources/drawable-mdpi/search_fox.png
mobile/android/base/resources/drawable-mdpi/search_history.png
mobile/android/base/resources/drawable-mdpi/search_icon_active.png
mobile/android/base/resources/drawable-mdpi/search_icon_inactive.png
mobile/android/base/resources/drawable-mdpi/search_launcher.png
mobile/android/base/resources/drawable-mdpi/search_plus.png
mobile/android/base/resources/drawable-mdpi/widget_bg.9.png
mobile/android/base/resources/drawable-xhdpi/ic_action_settings.png
mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.png
mobile/android/base/resources/drawable-xhdpi/ic_widget_search.png
mobile/android/base/resources/drawable-xhdpi/network_error.png
mobile/android/base/resources/drawable-xhdpi/search_clear.png
mobile/android/base/resources/drawable-xhdpi/search_fox.png
mobile/android/base/resources/drawable-xhdpi/search_history.png
mobile/android/base/resources/drawable-xhdpi/search_icon_active.png
mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.png
mobile/android/base/resources/drawable-xhdpi/search_launcher.png
mobile/android/base/resources/drawable-xhdpi/search_plus.png
mobile/android/base/resources/drawable-xhdpi/widget_bg.9.png
mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.png
mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.png
mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.png
mobile/android/base/resources/drawable-xxhdpi/network_error.png
mobile/android/base/resources/drawable-xxhdpi/search_clear.png
mobile/android/base/resources/drawable-xxhdpi/search_fox.png
mobile/android/base/resources/drawable-xxhdpi/search_history.png
mobile/android/base/resources/drawable-xxhdpi/search_icon_active.png
mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.png
mobile/android/base/resources/drawable-xxhdpi/search_launcher.png
mobile/android/base/resources/drawable-xxhdpi/search_plus.png
mobile/android/base/resources/drawable-xxxhdpi/search_launcher.png
mobile/android/base/resources/drawable/edit_text_default.xml
mobile/android/base/resources/drawable/edit_text_focused.xml
mobile/android/base/resources/drawable/facet_button_background.xml
mobile/android/base/resources/drawable/facet_button_background_default.xml
mobile/android/base/resources/drawable/facet_button_background_pressed.xml
mobile/android/base/resources/drawable/progressbar.xml
mobile/android/base/resources/drawable/search_row_background.xml
mobile/android/base/resources/drawable/widget_button_left.xml
mobile/android/base/resources/drawable/widget_button_left_default.xml
mobile/android/base/resources/drawable/widget_button_left_pressed.xml
mobile/android/base/resources/drawable/widget_button_middle.xml
mobile/android/base/resources/drawable/widget_button_middle_pressed.xml
mobile/android/base/resources/drawable/widget_button_right.xml
mobile/android/base/resources/drawable/widget_button_right_pressed.xml
mobile/android/base/resources/layout/keyguard_widget.xml
mobile/android/base/resources/layout/search_activity_main.xml
mobile/android/base/resources/layout/search_bar.xml
mobile/android/base/resources/layout/search_empty.xml
mobile/android/base/resources/layout/search_fragment_post_search.xml
mobile/android/base/resources/layout/search_fragment_pre_search.xml
mobile/android/base/resources/layout/search_history_row.xml
mobile/android/base/resources/layout/search_sugestions.xml
mobile/android/base/resources/layout/search_suggestions_row.xml
mobile/android/base/resources/layout/search_widget.xml
mobile/android/base/resources/values-v13/search_styles.xml
mobile/android/base/resources/values-v16/search_styles.xml
mobile/android/base/resources/values/search_attrs.xml
mobile/android/base/resources/values/search_colors.xml
mobile/android/base/resources/values/search_dimens.xml
mobile/android/base/resources/values/search_styles.xml
mobile/android/base/resources/xml/search_preferences.xml
mobile/android/base/resources/xml/search_widget_info.xml
mobile/android/search/java/org/mozilla/search/PostSearchFragment.java
mobile/android/search/java/org/mozilla/search/PreSearchFragment.java
mobile/android/search/java/org/mozilla/search/SearchActivity.java
mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java
mobile/android/search/java/org/mozilla/search/SearchWidget.java
mobile/android/search/java/org/mozilla/search/autocomplete/AutoCompleteAdapter.java
mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java
mobile/android/search/java/org/mozilla/search/autocomplete/SuggestionsFragment.java
mobile/android/search/java/org/mozilla/search/ui/FacetBar.java
mobile/android/search/res/color/facet_button_text_color.xml
mobile/android/search/res/drawable-hdpi/ic_action_settings.png
mobile/android/search/res/drawable-hdpi/ic_widget_new_tab.png
mobile/android/search/res/drawable-hdpi/ic_widget_search.png
mobile/android/search/res/drawable-hdpi/network_error.png
mobile/android/search/res/drawable-hdpi/search_clear.png
mobile/android/search/res/drawable-hdpi/search_fox.png
mobile/android/search/res/drawable-hdpi/search_history.png
mobile/android/search/res/drawable-hdpi/search_icon_active.png
mobile/android/search/res/drawable-hdpi/search_icon_inactive.png
mobile/android/search/res/drawable-hdpi/search_launcher.png
mobile/android/search/res/drawable-hdpi/search_plus.png
mobile/android/search/res/drawable-hdpi/widget_bg.9.png
mobile/android/search/res/drawable-mdpi/ic_action_settings.png
mobile/android/search/res/drawable-mdpi/ic_widget_new_tab.png
mobile/android/search/res/drawable-mdpi/ic_widget_search.png
mobile/android/search/res/drawable-mdpi/network_error.png
mobile/android/search/res/drawable-mdpi/search_clear.png
mobile/android/search/res/drawable-mdpi/search_fox.png
mobile/android/search/res/drawable-mdpi/search_history.png
mobile/android/search/res/drawable-mdpi/search_icon_active.png
mobile/android/search/res/drawable-mdpi/search_icon_inactive.png
mobile/android/search/res/drawable-mdpi/search_launcher.png
mobile/android/search/res/drawable-mdpi/search_plus.png
mobile/android/search/res/drawable-mdpi/widget_bg.9.png
mobile/android/search/res/drawable-xhdpi/ic_action_settings.png
mobile/android/search/res/drawable-xhdpi/ic_widget_new_tab.png
mobile/android/search/res/drawable-xhdpi/ic_widget_search.png
mobile/android/search/res/drawable-xhdpi/network_error.png
mobile/android/search/res/drawable-xhdpi/search_clear.png
mobile/android/search/res/drawable-xhdpi/search_fox.png
mobile/android/search/res/drawable-xhdpi/search_history.png
mobile/android/search/res/drawable-xhdpi/search_icon_active.png
mobile/android/search/res/drawable-xhdpi/search_icon_inactive.png
mobile/android/search/res/drawable-xhdpi/search_launcher.png
mobile/android/search/res/drawable-xhdpi/search_plus.png
mobile/android/search/res/drawable-xhdpi/widget_bg.9.png
mobile/android/search/res/drawable-xxhdpi/ic_action_settings.png
mobile/android/search/res/drawable-xxhdpi/ic_widget_new_tab.png
mobile/android/search/res/drawable-xxhdpi/ic_widget_search.png
mobile/android/search/res/drawable-xxhdpi/network_error.png
mobile/android/search/res/drawable-xxhdpi/search_clear.png
mobile/android/search/res/drawable-xxhdpi/search_fox.png
mobile/android/search/res/drawable-xxhdpi/search_history.png
mobile/android/search/res/drawable-xxhdpi/search_icon_active.png
mobile/android/search/res/drawable-xxhdpi/search_icon_inactive.png
mobile/android/search/res/drawable-xxhdpi/search_launcher.png
mobile/android/search/res/drawable-xxhdpi/search_plus.png
mobile/android/search/res/drawable-xxxhdpi/search_launcher.png
mobile/android/search/res/drawable/edit_text_default.xml
mobile/android/search/res/drawable/edit_text_focused.xml
mobile/android/search/res/drawable/facet_button_background.xml
mobile/android/search/res/drawable/facet_button_background_default.xml
mobile/android/search/res/drawable/facet_button_background_pressed.xml
mobile/android/search/res/drawable/progressbar.xml
mobile/android/search/res/drawable/search_row_background.xml
mobile/android/search/res/drawable/widget_button_left.xml
mobile/android/search/res/drawable/widget_button_left_default.xml
mobile/android/search/res/drawable/widget_button_left_pressed.xml
mobile/android/search/res/drawable/widget_button_middle.xml
mobile/android/search/res/drawable/widget_button_middle_pressed.xml
mobile/android/search/res/drawable/widget_button_right.xml
mobile/android/search/res/drawable/widget_button_right_pressed.xml
mobile/android/search/res/layout/keyguard_widget.xml
mobile/android/search/res/layout/search_activity_main.xml
mobile/android/search/res/layout/search_bar.xml
mobile/android/search/res/layout/search_empty.xml
mobile/android/search/res/layout/search_fragment_post_search.xml
mobile/android/search/res/layout/search_fragment_pre_search.xml
mobile/android/search/res/layout/search_history_row.xml
mobile/android/search/res/layout/search_sugestions.xml
mobile/android/search/res/layout/search_suggestions_row.xml
mobile/android/search/res/layout/search_widget.xml
mobile/android/search/res/values-v13/search_styles.xml
mobile/android/search/res/values-v16/search_styles.xml
mobile/android/search/res/values/search_attrs.xml
mobile/android/search/res/values/search_colors.xml
mobile/android/search/res/values/search_dimens.xml
mobile/android/search/res/values/search_styles.xml
mobile/android/search/res/xml/search_preferences.xml
mobile/android/search/res/xml/search_widget_info.xml
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -87,19 +87,17 @@ ALL_JARS = \
   sync-thirdparty.jar \
   $(NULL)
 
 ifdef MOZ_WEBRTC
 ALL_JARS += webrtc.jar
 endif
 
 ifdef MOZ_ANDROID_SEARCH_ACTIVITY
-extra_packages += org.mozilla.search
 ALL_JARS += search-activity.jar
-generated/org/mozilla/search/R.java: .aapt.deps ;
 endif
 
 ifdef MOZ_ANDROID_MLS_STUMBLER
 extra_packages += org.mozilla.mozstumbler
 ALL_JARS += ../stumbler/stumbler.jar
 generated/org/mozilla/mozstumbler/R.java: .aapt.deps ;
 endif
 
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -654,19 +654,16 @@ else:
 
 if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']:
     # The Search Activity is mostly independent of Fennec proper, but
     # it does depend on Geckoview.  Therefore, we build it as a jar
     # that depends on the Geckoview jars.
     search_source_dir = SRCDIR + '/../search'
     include('../search/search_activity_sources.mozbuild')
 
-    ANDROID_RES_DIRS += [search_source_dir + '/res']
-    resjar.generated_sources += ['org/mozilla/search/R.java']
-
     search_activity = add_java_jar('search-activity')
     search_activity.sources += [search_source_dir + '/' + f for f in search_activity_sources]
     search_activity.javac_flags += ['-Xlint:all']
     search_activity.extra_jars = [
         'gecko-R.jar',
         'gecko-browser.jar',
         'gecko-mozglue.jar',
         'gecko-thirdparty.jar',
@@ -826,22 +823,10 @@ if CONFIG['MOZ_CRASHREPORTER']:
     resources.referenced_projects += ['../' + crashreporter.name]
 
 if CONFIG['MOZ_ANDROID_MLS_STUMBLER']:
     main.included_projects += ['../FennecStumbler']
     main.referenced_projects += ['../FennecStumbler']
     DEFINES['MOZ_STUMBLER_API_KEY'] = CONFIG['MOZ_MOZILLA_API_KEY']
 
 if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']:
-    searchres = add_android_eclipse_library_project('FennecResourcesSearch')
-    # Eclipse generates org.mozilla.search.R for this project, which is
-    # referenced by the search/**/*.java code.
-    searchres.package_name = 'org.mozilla.search'
-    searchres.res = SRCDIR + '/../search/res'
-
-    searchres.included_projects += ['../' + static.name, '../' + generated.name, '../' + branding.name]
-    searchres.referenced_projects += ['../' + static.name, '../' + generated.name, '../' + branding.name]
-
-    resources.included_projects += ['../' + searchres.name]
-    resources.referenced_projects += ['../' + searchres.name]
-
     # The Search Activity code is built as part of Fennec, so we follow suit in Eclipse.
     main.add_classpathentry('search', TOPSRCDIR + '/mobile/android/search/java', dstdir='search')
rename from mobile/android/search/res/color/facet_button_text_color.xml
rename to mobile/android/base/resources/color/facet_button_text_color.xml
rename from mobile/android/search/res/drawable-hdpi/ic_action_settings.png
rename to mobile/android/base/resources/drawable-hdpi/ic_action_settings.png
rename from mobile/android/search/res/drawable-hdpi/ic_widget_new_tab.png
rename to mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.png
rename from mobile/android/search/res/drawable-hdpi/ic_widget_search.png
rename to mobile/android/base/resources/drawable-hdpi/ic_widget_search.png
rename from mobile/android/search/res/drawable-hdpi/network_error.png
rename to mobile/android/base/resources/drawable-hdpi/network_error.png
rename from mobile/android/search/res/drawable-hdpi/search_clear.png
rename to mobile/android/base/resources/drawable-hdpi/search_clear.png
rename from mobile/android/search/res/drawable-hdpi/search_fox.png
rename to mobile/android/base/resources/drawable-hdpi/search_fox.png
rename from mobile/android/search/res/drawable-hdpi/search_history.png
rename to mobile/android/base/resources/drawable-hdpi/search_history.png
rename from mobile/android/search/res/drawable-hdpi/search_icon_active.png
rename to mobile/android/base/resources/drawable-hdpi/search_icon_active.png
rename from mobile/android/search/res/drawable-hdpi/search_icon_inactive.png
rename to mobile/android/base/resources/drawable-hdpi/search_icon_inactive.png
rename from mobile/android/search/res/drawable-hdpi/search_launcher.png
rename to mobile/android/base/resources/drawable-hdpi/search_launcher.png
rename from mobile/android/search/res/drawable-hdpi/search_plus.png
rename to mobile/android/base/resources/drawable-hdpi/search_plus.png
rename from mobile/android/search/res/drawable-hdpi/widget_bg.9.png
rename to mobile/android/base/resources/drawable-hdpi/widget_bg.9.png
rename from mobile/android/search/res/drawable-mdpi/ic_action_settings.png
rename to mobile/android/base/resources/drawable-mdpi/ic_action_settings.png
rename from mobile/android/search/res/drawable-mdpi/ic_widget_new_tab.png
rename to mobile/android/base/resources/drawable-mdpi/ic_widget_new_tab.png
rename from mobile/android/search/res/drawable-mdpi/ic_widget_search.png
rename to mobile/android/base/resources/drawable-mdpi/ic_widget_search.png
rename from mobile/android/search/res/drawable-mdpi/network_error.png
rename to mobile/android/base/resources/drawable-mdpi/network_error.png
rename from mobile/android/search/res/drawable-mdpi/search_clear.png
rename to mobile/android/base/resources/drawable-mdpi/search_clear.png
rename from mobile/android/search/res/drawable-mdpi/search_fox.png
rename to mobile/android/base/resources/drawable-mdpi/search_fox.png
rename from mobile/android/search/res/drawable-mdpi/search_history.png
rename to mobile/android/base/resources/drawable-mdpi/search_history.png
rename from mobile/android/search/res/drawable-mdpi/search_icon_active.png
rename to mobile/android/base/resources/drawable-mdpi/search_icon_active.png
rename from mobile/android/search/res/drawable-mdpi/search_icon_inactive.png
rename to mobile/android/base/resources/drawable-mdpi/search_icon_inactive.png
rename from mobile/android/search/res/drawable-mdpi/search_launcher.png
rename to mobile/android/base/resources/drawable-mdpi/search_launcher.png
rename from mobile/android/search/res/drawable-mdpi/search_plus.png
rename to mobile/android/base/resources/drawable-mdpi/search_plus.png
rename from mobile/android/search/res/drawable-mdpi/widget_bg.9.png
rename to mobile/android/base/resources/drawable-mdpi/widget_bg.9.png
rename from mobile/android/search/res/drawable-xhdpi/ic_action_settings.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_action_settings.png
rename from mobile/android/search/res/drawable-xhdpi/ic_widget_new_tab.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.png
rename from mobile/android/search/res/drawable-xhdpi/ic_widget_search.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_widget_search.png
rename from mobile/android/search/res/drawable-xhdpi/network_error.png
rename to mobile/android/base/resources/drawable-xhdpi/network_error.png
rename from mobile/android/search/res/drawable-xhdpi/search_clear.png
rename to mobile/android/base/resources/drawable-xhdpi/search_clear.png
rename from mobile/android/search/res/drawable-xhdpi/search_fox.png
rename to mobile/android/base/resources/drawable-xhdpi/search_fox.png
rename from mobile/android/search/res/drawable-xhdpi/search_history.png
rename to mobile/android/base/resources/drawable-xhdpi/search_history.png
rename from mobile/android/search/res/drawable-xhdpi/search_icon_active.png
rename to mobile/android/base/resources/drawable-xhdpi/search_icon_active.png
rename from mobile/android/search/res/drawable-xhdpi/search_icon_inactive.png
rename to mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.png
rename from mobile/android/search/res/drawable-xhdpi/search_launcher.png
rename to mobile/android/base/resources/drawable-xhdpi/search_launcher.png
rename from mobile/android/search/res/drawable-xhdpi/search_plus.png
rename to mobile/android/base/resources/drawable-xhdpi/search_plus.png
rename from mobile/android/search/res/drawable-xhdpi/widget_bg.9.png
rename to mobile/android/base/resources/drawable-xhdpi/widget_bg.9.png
rename from mobile/android/search/res/drawable-xxhdpi/ic_action_settings.png
rename to mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.png
rename from mobile/android/search/res/drawable-xxhdpi/ic_widget_new_tab.png
rename to mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.png
rename from mobile/android/search/res/drawable-xxhdpi/ic_widget_search.png
rename to mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.png
rename from mobile/android/search/res/drawable-xxhdpi/network_error.png
rename to mobile/android/base/resources/drawable-xxhdpi/network_error.png
rename from mobile/android/search/res/drawable-xxhdpi/search_clear.png
rename to mobile/android/base/resources/drawable-xxhdpi/search_clear.png
rename from mobile/android/search/res/drawable-xxhdpi/search_fox.png
rename to mobile/android/base/resources/drawable-xxhdpi/search_fox.png
rename from mobile/android/search/res/drawable-xxhdpi/search_history.png
rename to mobile/android/base/resources/drawable-xxhdpi/search_history.png
rename from mobile/android/search/res/drawable-xxhdpi/search_icon_active.png
rename to mobile/android/base/resources/drawable-xxhdpi/search_icon_active.png
rename from mobile/android/search/res/drawable-xxhdpi/search_icon_inactive.png
rename to mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.png
rename from mobile/android/search/res/drawable-xxhdpi/search_launcher.png
rename to mobile/android/base/resources/drawable-xxhdpi/search_launcher.png
rename from mobile/android/search/res/drawable-xxhdpi/search_plus.png
rename to mobile/android/base/resources/drawable-xxhdpi/search_plus.png
rename from mobile/android/search/res/drawable-xxxhdpi/search_launcher.png
rename to mobile/android/base/resources/drawable-xxxhdpi/search_launcher.png
rename from mobile/android/search/res/drawable/edit_text_default.xml
rename to mobile/android/base/resources/drawable/edit_text_default.xml
rename from mobile/android/search/res/drawable/edit_text_focused.xml
rename to mobile/android/base/resources/drawable/edit_text_focused.xml
rename from mobile/android/search/res/drawable/facet_button_background.xml
rename to mobile/android/base/resources/drawable/facet_button_background.xml
rename from mobile/android/search/res/drawable/facet_button_background_default.xml
rename to mobile/android/base/resources/drawable/facet_button_background_default.xml
rename from mobile/android/search/res/drawable/facet_button_background_pressed.xml
rename to mobile/android/base/resources/drawable/facet_button_background_pressed.xml
rename from mobile/android/search/res/drawable/progressbar.xml
rename to mobile/android/base/resources/drawable/progressbar.xml
rename from mobile/android/search/res/drawable/search_row_background.xml
rename to mobile/android/base/resources/drawable/search_row_background.xml
rename from mobile/android/search/res/drawable/widget_button_left.xml
rename to mobile/android/base/resources/drawable/widget_button_left.xml
rename from mobile/android/search/res/drawable/widget_button_left_default.xml
rename to mobile/android/base/resources/drawable/widget_button_left_default.xml
rename from mobile/android/search/res/drawable/widget_button_left_pressed.xml
rename to mobile/android/base/resources/drawable/widget_button_left_pressed.xml
rename from mobile/android/search/res/drawable/widget_button_middle.xml
rename to mobile/android/base/resources/drawable/widget_button_middle.xml
rename from mobile/android/search/res/drawable/widget_button_middle_pressed.xml
rename to mobile/android/base/resources/drawable/widget_button_middle_pressed.xml
rename from mobile/android/search/res/drawable/widget_button_right.xml
rename to mobile/android/base/resources/drawable/widget_button_right.xml
rename from mobile/android/search/res/drawable/widget_button_right_pressed.xml
rename to mobile/android/base/resources/drawable/widget_button_right_pressed.xml
rename from mobile/android/search/res/layout/keyguard_widget.xml
rename to mobile/android/base/resources/layout/keyguard_widget.xml
rename from mobile/android/search/res/layout/search_activity_main.xml
rename to mobile/android/base/resources/layout/search_activity_main.xml
rename from mobile/android/search/res/layout/search_bar.xml
rename to mobile/android/base/resources/layout/search_bar.xml
rename from mobile/android/search/res/layout/search_empty.xml
rename to mobile/android/base/resources/layout/search_empty.xml
rename from mobile/android/search/res/layout/search_fragment_post_search.xml
rename to mobile/android/base/resources/layout/search_fragment_post_search.xml
rename from mobile/android/search/res/layout/search_fragment_pre_search.xml
rename to mobile/android/base/resources/layout/search_fragment_pre_search.xml
rename from mobile/android/search/res/layout/search_history_row.xml
rename to mobile/android/base/resources/layout/search_history_row.xml
rename from mobile/android/search/res/layout/search_sugestions.xml
rename to mobile/android/base/resources/layout/search_sugestions.xml
rename from mobile/android/search/res/layout/search_suggestions_row.xml
rename to mobile/android/base/resources/layout/search_suggestions_row.xml
rename from mobile/android/search/res/layout/search_widget.xml
rename to mobile/android/base/resources/layout/search_widget.xml
rename from mobile/android/search/res/values-v13/search_styles.xml
rename to mobile/android/base/resources/values-v13/search_styles.xml
rename from mobile/android/search/res/values-v16/search_styles.xml
rename to mobile/android/base/resources/values-v16/search_styles.xml
rename from mobile/android/search/res/values/search_attrs.xml
rename to mobile/android/base/resources/values/search_attrs.xml
rename from mobile/android/search/res/values/search_colors.xml
rename to mobile/android/base/resources/values/search_colors.xml
rename from mobile/android/search/res/values/search_dimens.xml
rename to mobile/android/base/resources/values/search_dimens.xml
rename from mobile/android/search/res/values/search_styles.xml
rename to mobile/android/base/resources/values/search_styles.xml
rename from mobile/android/search/res/xml/search_preferences.xml
rename to mobile/android/base/resources/xml/search_preferences.xml
rename from mobile/android/search/res/xml/search_widget_info.xml
rename to mobile/android/base/resources/xml/search_widget_info.xml
--- a/mobile/android/search/java/org/mozilla/search/PostSearchFragment.java
+++ b/mobile/android/search/java/org/mozilla/search/PostSearchFragment.java
@@ -1,40 +1,40 @@
 /* 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.search;
 
+import java.net.URISyntaxException;
+
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.search.providers.SearchEngine;
+
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import org.mozilla.gecko.AppConstants;
-import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.search.providers.SearchEngine;
-
-import java.net.URISyntaxException;
-
 public class PostSearchFragment extends Fragment {
 
     private static final String LOG_TAG = "PostSearchFragment";
 
     private SearchEngine engine;
 
     private ProgressBar progressBar;
     private WebView webview;
--- a/mobile/android/search/java/org/mozilla/search/PreSearchFragment.java
+++ b/mobile/android/search/java/org/mozilla/search/PreSearchFragment.java
@@ -21,16 +21,17 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserContract.SearchHistory;
 import org.mozilla.gecko.widget.SwipeDismissListViewTouchListener;
 import org.mozilla.gecko.widget.SwipeDismissListViewTouchListener.OnDismissCallback;
 import org.mozilla.search.AcceptsSearchQuery.SuggestionAnimation;
 
--- a/mobile/android/search/java/org/mozilla/search/SearchActivity.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchActivity.java
@@ -1,15 +1,16 @@
 /* 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.search;
 
 import org.mozilla.gecko.LocaleAware;
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.db.BrowserContract.SearchHistory;
 import org.mozilla.gecko.health.BrowserHealthRecorder;
 import org.mozilla.search.autocomplete.SearchBar;
 import org.mozilla.search.autocomplete.SuggestionsFragment;
 import org.mozilla.search.providers.SearchEngine;
 import org.mozilla.search.providers.SearchEngineManager;
--- a/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java
@@ -1,30 +1,31 @@
 /* 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.search;
 
+import org.mozilla.gecko.GeckoSharedPrefs;
+import org.mozilla.gecko.LocaleAware;
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.gecko.db.BrowserContract;
+
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.util.Log;
 import android.widget.Toast;
 
-import org.mozilla.gecko.GeckoSharedPrefs;
-import org.mozilla.gecko.LocaleAware;
-import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.gecko.db.BrowserContract;
-
 /**
  * This activity allows users to modify the settings for the search activity.
  *
  * A note on implementation: At the moment, we don't have tablet-specific designs.
  * Therefore, this implementation uses the old-style PreferenceActivity. When
  * we start optimizing for tablets, we can migrate to Fennec's PreferenceFragment
  * implementation.
  *
--- a/mobile/android/search/java/org/mozilla/search/SearchWidget.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchWidget.java
@@ -2,16 +2,17 @@
  * 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.search;
 
 import org.mozilla.gecko.AboutPages;
 import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.appwidget.AppWidgetProviderInfo;
--- a/mobile/android/search/java/org/mozilla/search/autocomplete/AutoCompleteAdapter.java
+++ b/mobile/android/search/java/org/mozilla/search/autocomplete/AutoCompleteAdapter.java
@@ -1,27 +1,27 @@
 /* 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.search.autocomplete;
 
+import java.util.List;
+
+import org.mozilla.gecko.R;
+import org.mozilla.search.AcceptsSearchQuery;
+import org.mozilla.search.autocomplete.SuggestionsFragment.Suggestion;
+
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import org.mozilla.search.AcceptsSearchQuery;
-import org.mozilla.search.R;
-import org.mozilla.search.autocomplete.SuggestionsFragment.Suggestion;
-
-import java.util.List;
-
 /**
  * The adapter that is used to populate the autocomplete rows.
  */
 class AutoCompleteAdapter extends ArrayAdapter<Suggestion> {
 
     private final AcceptsSearchQuery searchListener;
 
     private final LayoutInflater inflater;
--- a/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java
+++ b/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java
@@ -1,14 +1,20 @@
 /* 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.search.autocomplete;
 
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.gecko.gfx.BitmapUtils;
+import org.mozilla.search.providers.SearchEngine;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.text.Editable;
@@ -21,22 +27,16 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.gecko.gfx.BitmapUtils;
-import org.mozilla.search.R;
-import org.mozilla.search.providers.SearchEngine;
-
 public class SearchBar extends FrameLayout {
 
     private final EditText editText;
     private final ImageButton clearButton;
     private final ImageView engineIcon;
 
     private final Drawable focusedBackground;
     private final Drawable defaultBackgound;
--- a/mobile/android/search/java/org/mozilla/search/autocomplete/SuggestionsFragment.java
+++ b/mobile/android/search/java/org/mozilla/search/autocomplete/SuggestionsFragment.java
@@ -1,14 +1,25 @@
 /* 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.search.autocomplete;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.SuggestClient;
+import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.search.AcceptsSearchQuery;
+import org.mozilla.search.AcceptsSearchQuery.SuggestionAnimation;
+import org.mozilla.search.providers.SearchEngine;
+
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.AsyncTaskLoader;
 import android.support.v4.content.Loader;
@@ -16,27 +27,16 @@ import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import org.mozilla.gecko.SuggestClient;
-import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.search.AcceptsSearchQuery;
-import org.mozilla.search.AcceptsSearchQuery.SuggestionAnimation;
-import org.mozilla.search.R;
-import org.mozilla.search.providers.SearchEngine;
-
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A fragment to show search suggestions.
  */
 public class SuggestionsFragment extends Fragment {
 
     private static final String LOG_TAG = "SuggestionsFragment";
 
     private static final int LOADER_ID_SUGGESTION = 0;
--- a/mobile/android/search/java/org/mozilla/search/ui/FacetBar.java
+++ b/mobile/android/search/java/org/mozilla/search/ui/FacetBar.java
@@ -1,24 +1,24 @@
 /* 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.search.ui;
 
+import org.mozilla.gecko.R;
+
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
-import org.mozilla.search.R;
-
 public class FacetBar extends RadioGroup {
 
     // Ensure facets have equal width and match the bar's height. Supplying these
     // in styles.xml/FacetButtonStyle does not work. See:
     //   http://stackoverflow.com/questions/24213193/android-ignores-layout-weight-parameter-from-styles-xml
     private static final RadioGroup.LayoutParams FACET_LAYOUT_PARAMS =
             new RadioGroup.LayoutParams(0, LayoutParams.MATCH_PARENT, 1.0f);