diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 62b2971b50f..ba6e706926b 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -285,92 +285,98 @@ RES_DRAWABLE_NODPI = \ res/drawable-nodpi/tabs_tray_pressed_bg.png \ $(NULL) -RES_DRAWABLE_MDPI_V8 = \ - res/drawable-mdpi-v8/favicon.png \ - res/drawable-mdpi-v8/abouthome_icon.png \ - res/drawable-mdpi-v8/abouthome_logo.png \ - res/drawable-mdpi-v8/abouthome_separator.9.png \ - res/drawable-mdpi-v8/abouthome_sync_logo.png \ - res/drawable-mdpi-v8/abouthome_sync_bg.9.png \ - res/drawable-mdpi-v8/abouthome_sync_pressed_bg.9.png \ - res/drawable-mdpi-v8/abouthome_topsite_placeholder.png \ - res/drawable-mdpi-v8/abouthome_topsite_shadow.9.png \ - res/drawable-mdpi-v8/awesomebar_tab.9.png \ - res/drawable-mdpi-v8/awesomebar_tab_pressed.9.png \ - res/drawable-mdpi-v8/ic_addons_empty.png \ - res/drawable-mdpi-v8/ic_awesomebar_go.png \ - res/drawable-mdpi-v8/ic_awesomebar_search.png \ - res/drawable-mdpi-v8/ic_menu_bookmark_add.png \ - res/drawable-mdpi-v8/ic_menu_bookmark_remove.png \ - res/drawable-mdpi-v8/ic_menu_find_in_page.png \ - res/drawable-mdpi-v8/ic_menu_reload.png \ - res/drawable-mdpi-v8/ic_menu_save_as_pdf.png \ - res/drawable-mdpi-v8/ic_menu_share.png \ - res/drawable-mdpi-v8/ic_menu_forward.png \ - res/drawable-mdpi-v8/tab_new.png \ - res/drawable-mdpi-v8/tab_close.png \ - res/drawable-mdpi-v8/tab_thumbnail_default.png \ - res/drawable-mdpi-v8/tab_thumbnail_shadow.png \ - res/drawable-mdpi-v8/tab_selected.png \ - res/drawable-mdpi-v8/tabs_normal.png \ - res/drawable-mdpi-v8/tabs_pressed.png \ - res/drawable-mdpi-v8/tabs_more.png \ - res/drawable-mdpi-v8/tabs_plus.png \ - res/drawable-mdpi-v8/address_bar_texture.png \ - res/drawable-mdpi-v8/address_bar_url_bg.9.png \ - res/drawable-mdpi-v8/address_bar_url_outline.9.png \ - res/drawable-mdpi-v8/doorhanger_arrow.png \ - res/drawable-mdpi-v8/doorhanger_bg.9.png \ - res/drawable-mdpi-v8/doorhanger_shadow_bg.9.png \ - res/drawable-mdpi-v8/doorhanger_popup_bg.9.png \ - res/drawable-mdpi-v8/site_security_identified.png \ - res/drawable-mdpi-v8/site_security_verified.png \ - res/drawable-mdpi-v8/urlbar_stop.png \ +RES_DRAWABLE_BASE = \ + res/drawable/favicon.png \ + res/drawable/abouthome_icon.png \ + res/drawable/abouthome_logo.png \ + res/drawable/abouthome_separator.9.png \ + res/drawable/abouthome_sync_logo.png \ + res/drawable/abouthome_sync_bg.9.png \ + res/drawable/abouthome_sync_pressed_bg.9.png \ + res/drawable/abouthome_topsite_placeholder.png \ + res/drawable/abouthome_topsite_shadow.9.png \ + res/drawable/awesomebar_tab.9.png \ + res/drawable/awesomebar_tab_pressed.9.png \ + res/drawable/ic_addons_empty.png \ + res/drawable/ic_awesomebar_go.png \ + res/drawable/ic_awesomebar_search.png \ + res/drawable/ic_menu_bookmark_add.png \ + res/drawable/ic_menu_bookmark_remove.png \ + res/drawable/ic_menu_find_in_page.png \ + res/drawable/ic_menu_reload.png \ + res/drawable/ic_menu_save_as_pdf.png \ + res/drawable/ic_menu_share.png \ + res/drawable/ic_menu_forward.png \ + res/drawable/tab_new.png \ + res/drawable/tab_close.png \ + res/drawable/tab_thumbnail_default.png \ + res/drawable/tab_thumbnail_shadow.png \ + res/drawable/tab_selected.png \ + res/drawable/tabs_normal.png \ + res/drawable/tabs_pressed.png \ + res/drawable/tabs_more.png \ + res/drawable/tabs_plus.png \ + res/drawable/address_bar_texture.png \ + res/drawable/address_bar_url_bg.9.png \ + res/drawable/address_bar_url_outline.9.png \ + res/drawable/doorhanger_arrow.png \ + res/drawable/doorhanger_bg.9.png \ + res/drawable/doorhanger_shadow_bg.9.png \ + res/drawable/doorhanger_popup_bg.9.png \ + res/drawable/site_security_identified.png \ + res/drawable/site_security_verified.png \ + res/drawable/urlbar_stop.png \ + $(addprefix res/drawable-mdpi/,$(notdir $(SYNC_RES_DRAWABLE_MDPI))) \ $(NULL) -RES_DRAWABLE_HDPI_V8 = \ - res/drawable-hdpi-v8/favicon.png \ - res/drawable-hdpi-v8/home_bg.png \ - res/drawable-hdpi-v8/home_star.png \ - res/drawable-hdpi-v8/abouthome_icon.png \ - res/drawable-hdpi-v8/abouthome_logo.png \ - res/drawable-hdpi-v8/abouthome_separator.9.png \ - res/drawable-hdpi-v8/abouthome_sync_logo.png \ - res/drawable-hdpi-v8/abouthome_sync_bg.9.png \ - res/drawable-hdpi-v8/abouthome_sync_pressed_bg.9.png \ - res/drawable-hdpi-v8/abouthome_topsite_placeholder.png \ - res/drawable-hdpi-v8/abouthome_topsite_shadow.9.png \ - res/drawable-hdpi-v8/awesomebar_tab.9.png \ - res/drawable-hdpi-v8/awesomebar_tab_pressed.9.png \ - res/drawable-hdpi-v8/ic_addons_empty.png \ - res/drawable-hdpi-v8/ic_awesomebar_go.png \ - res/drawable-hdpi-v8/ic_awesomebar_search.png \ - res/drawable-hdpi-v8/ic_menu_bookmark_add.png \ - res/drawable-hdpi-v8/ic_menu_bookmark_remove.png \ - res/drawable-hdpi-v8/ic_menu_find_in_page.png \ - res/drawable-hdpi-v8/ic_menu_reload.png \ - res/drawable-hdpi-v8/ic_menu_save_as_pdf.png \ - res/drawable-hdpi-v8/ic_menu_share.png \ - res/drawable-hdpi-v8/ic_menu_forward.png \ - res/drawable-hdpi-v8/tab_new.png \ - res/drawable-hdpi-v8/tab_close.png \ - res/drawable-hdpi-v8/tab_thumbnail_default.png \ - res/drawable-hdpi-v8/tab_thumbnail_shadow.png \ - res/drawable-hdpi-v8/tab_selected.png \ - res/drawable-hdpi-v8/tabs_normal.png \ - res/drawable-hdpi-v8/tabs_pressed.png \ - res/drawable-hdpi-v8/tabs_more.png \ - res/drawable-hdpi-v8/tabs_plus.png \ - res/drawable-hdpi-v8/address_bar_texture.png \ - res/drawable-hdpi-v8/address_bar_url_bg.9.png \ - res/drawable-hdpi-v8/address_bar_url_outline.9.png \ - res/drawable-hdpi-v8/doorhanger_arrow.png \ - res/drawable-hdpi-v8/doorhanger_bg.9.png \ - res/drawable-hdpi-v8/doorhanger_shadow_bg.9.png \ - res/drawable-hdpi-v8/doorhanger_popup_bg.9.png \ - res/drawable-hdpi-v8/site_security_identified.png \ - res/drawable-hdpi-v8/site_security_verified.png \ - res/drawable-hdpi-v8/urlbar_stop.png \ +RES_DRAWABLE_LDPI = \ + $(addprefix res/drawable-ldpi/,$(notdir $(SYNC_RES_DRAWABLE_LDPI))) \ + $(NULL) + +RES_DRAWABLE_HDPI = \ + res/drawable-hdpi/favicon.png \ + res/drawable-hdpi/home_bg.png \ + res/drawable-hdpi/home_star.png \ + res/drawable-hdpi/abouthome_icon.png \ + res/drawable-hdpi/abouthome_logo.png \ + res/drawable-hdpi/abouthome_separator.9.png \ + res/drawable-hdpi/abouthome_sync_logo.png \ + res/drawable-hdpi/abouthome_sync_bg.9.png \ + res/drawable-hdpi/abouthome_sync_pressed_bg.9.png \ + res/drawable-hdpi/abouthome_topsite_placeholder.png \ + res/drawable-hdpi/abouthome_topsite_shadow.9.png \ + res/drawable-hdpi/awesomebar_tab.9.png \ + res/drawable-hdpi/awesomebar_tab_pressed.9.png \ + res/drawable-hdpi/ic_addons_empty.png \ + res/drawable-hdpi/ic_awesomebar_go.png \ + res/drawable-hdpi/ic_awesomebar_search.png \ + res/drawable-hdpi/ic_menu_bookmark_add.png \ + res/drawable-hdpi/ic_menu_bookmark_remove.png \ + res/drawable-hdpi/ic_menu_find_in_page.png \ + res/drawable-hdpi/ic_menu_reload.png \ + res/drawable-hdpi/ic_menu_save_as_pdf.png \ + res/drawable-hdpi/ic_menu_share.png \ + res/drawable-hdpi/ic_menu_forward.png \ + res/drawable-hdpi/tab_new.png \ + res/drawable-hdpi/tab_close.png \ + res/drawable-hdpi/tab_thumbnail_default.png \ + res/drawable-hdpi/tab_thumbnail_shadow.png \ + res/drawable-hdpi/tab_selected.png \ + res/drawable-hdpi/tabs_normal.png \ + res/drawable-hdpi/tabs_pressed.png \ + res/drawable-hdpi/tabs_more.png \ + res/drawable-hdpi/tabs_plus.png \ + res/drawable-hdpi/address_bar_texture.png \ + res/drawable-hdpi/address_bar_url_bg.9.png \ + res/drawable-hdpi/address_bar_url_outline.9.png \ + res/drawable-hdpi/doorhanger_arrow.png \ + res/drawable-hdpi/doorhanger_bg.9.png \ + res/drawable-hdpi/doorhanger_shadow_bg.9.png \ + res/drawable-hdpi/doorhanger_popup_bg.9.png \ + res/drawable-hdpi/site_security_identified.png \ + res/drawable-hdpi/site_security_verified.png \ + res/drawable-hdpi/urlbar_stop.png \ + $(addprefix res/drawable-hdpi/,$(notdir $(SYNC_RES_DRAWABLE_HDPI))) \ $(NULL) RES_DRAWABLE_MDPI_V11 = \ @@ -545,7 +551,7 @@ MOZ_ANDROID_DRAWABLES += \ MOZ_ANDROID_DRAWABLES += $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' '; fi) -RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_V11) $(RES_LAYOUT_LAND_V14) $(RES_VALUES) $(RES_VALUES_V11) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_MDPI_V8) $(RES_DRAWABLE_HDPI_V8) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_COLOR) $(RES_MENU) +RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_V11) $(RES_LAYOUT_LAND_V14) $(RES_VALUES) $(RES_VALUES_V11) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_COLOR) $(RES_MENU) RES_DIRS= \ res/layout \ @@ -559,8 +565,7 @@ RES_DIRS= \ res/drawable-ldpi \ res/drawable-mdpi \ res/drawable-hdpi \ - res/drawable-mdpi-v8 \ - res/drawable-hdpi-v8 \ + res/drawable \ res/drawable-mdpi-v9 \ res/drawable-hdpi-v9 \ res/drawable-mdpi-v11 \ @@ -617,21 +622,6 @@ $(RES_DRAWABLE): $(addprefix $(topsrcdir)/,$(MOZ_ANDROID_DRAWABLES)) $(NSINSTALL) -D res/drawable $(NSINSTALL) $^ res/drawable/ -RES_DRAWABLE_LDPI = $(addprefix res/drawable-ldpi/,$(notdir $(SYNC_RES_DRAWABLE_LDPI))) -$(RES_DRAWABLE_LDPI): $(addprefix $(topsrcdir)/,$(SYNC_RES_DRAWABLE_LDPI)) - $(NSINSTALL) -D res/drawable-ldpi - $(NSINSTALL) $^ res/drawable-ldpi/ - -RES_DRAWABLE_MDPI = $(addprefix res/drawable-mdpi/,$(notdir $(SYNC_RES_DRAWABLE_MDPI))) -$(RES_DRAWABLE_MDPI): $(addprefix $(topsrcdir)/,$(SYNC_RES_DRAWABLE_MDPI)) - $(NSINSTALL) -D res/drawable-mdpi - $(NSINSTALL) $^ res/drawable-mdpi/ - -RES_DRAWABLE_HDPI = $(addprefix res/drawable-hdpi/,$(notdir $(SYNC_RES_DRAWABLE_HDPI))) -$(RES_DRAWABLE_HDPI): $(addprefix $(topsrcdir)/,$(SYNC_RES_DRAWABLE_HDPI)) - $(NSINSTALL) -D res/drawable-hdpi - $(NSINSTALL) $^ res/drawable-hdpi/ - res/values/defaults.xml: $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/res/values/defaults.xml $(NSINSTALL) -D res/values $(NSINSTALL) $^ res/values diff --git a/mobile/android/base/resources/drawable-hdpi-v8/abouthome_icon.png b/mobile/android/base/resources/drawable-hdpi/abouthome_icon.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/abouthome_icon.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_icon.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/abouthome_logo.png b/mobile/android/base/resources/drawable-hdpi/abouthome_logo.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/abouthome_logo.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_logo.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/abouthome_separator.9.png b/mobile/android/base/resources/drawable-hdpi/abouthome_separator.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/abouthome_separator.9.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_separator.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/abouthome_sync_bg.9.png b/mobile/android/base/resources/drawable-hdpi/abouthome_sync_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/abouthome_sync_bg.9.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_sync_bg.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/abouthome_sync_logo.png b/mobile/android/base/resources/drawable-hdpi/abouthome_sync_logo.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/abouthome_sync_logo.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_sync_logo.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/abouthome_sync_pressed_bg.9.png b/mobile/android/base/resources/drawable-hdpi/abouthome_sync_pressed_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/abouthome_sync_pressed_bg.9.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_sync_pressed_bg.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/abouthome_topsite_placeholder.png b/mobile/android/base/resources/drawable-hdpi/abouthome_topsite_placeholder.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/abouthome_topsite_placeholder.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_topsite_placeholder.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/abouthome_topsite_shadow.9.png b/mobile/android/base/resources/drawable-hdpi/abouthome_topsite_shadow.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/abouthome_topsite_shadow.9.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_topsite_shadow.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/address_bar_texture.png b/mobile/android/base/resources/drawable-hdpi/address_bar_texture.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/address_bar_texture.png rename to mobile/android/base/resources/drawable-hdpi/address_bar_texture.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/address_bar_url_bg.9.png b/mobile/android/base/resources/drawable-hdpi/address_bar_url_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/address_bar_url_bg.9.png rename to mobile/android/base/resources/drawable-hdpi/address_bar_url_bg.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/address_bar_url_outline.9.png b/mobile/android/base/resources/drawable-hdpi/address_bar_url_outline.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/address_bar_url_outline.9.png rename to mobile/android/base/resources/drawable-hdpi/address_bar_url_outline.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_tab.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png rename to mobile/android/base/resources/drawable-hdpi/awesomebar_tab.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png b/mobile/android/base/resources/drawable-hdpi/awesomebar_tab_pressed.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png rename to mobile/android/base/resources/drawable-hdpi/awesomebar_tab_pressed.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/doorhanger_arrow.png b/mobile/android/base/resources/drawable-hdpi/doorhanger_arrow.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/doorhanger_arrow.png rename to mobile/android/base/resources/drawable-hdpi/doorhanger_arrow.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/doorhanger_bg.9.png b/mobile/android/base/resources/drawable-hdpi/doorhanger_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/doorhanger_bg.9.png rename to mobile/android/base/resources/drawable-hdpi/doorhanger_bg.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/doorhanger_popup_bg.9.png b/mobile/android/base/resources/drawable-hdpi/doorhanger_popup_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/doorhanger_popup_bg.9.png rename to mobile/android/base/resources/drawable-hdpi/doorhanger_popup_bg.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/doorhanger_shadow_bg.9.png b/mobile/android/base/resources/drawable-hdpi/doorhanger_shadow_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/doorhanger_shadow_bg.9.png rename to mobile/android/base/resources/drawable-hdpi/doorhanger_shadow_bg.9.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/favicon.png b/mobile/android/base/resources/drawable-hdpi/favicon.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/favicon.png rename to mobile/android/base/resources/drawable-hdpi/favicon.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/home_bg.png b/mobile/android/base/resources/drawable-hdpi/home_bg.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/home_bg.png rename to mobile/android/base/resources/drawable-hdpi/home_bg.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/home_star.png b/mobile/android/base/resources/drawable-hdpi/home_star.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/home_star.png rename to mobile/android/base/resources/drawable-hdpi/home_star.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_addons_empty.png b/mobile/android/base/resources/drawable-hdpi/ic_addons_empty.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_addons_empty.png rename to mobile/android/base/resources/drawable-hdpi/ic_addons_empty.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_go.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_awesomebar_go.png rename to mobile/android/base/resources/drawable-hdpi/ic_awesomebar_go.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_search.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_awesomebar_search.png rename to mobile/android/base/resources/drawable-hdpi/ic_awesomebar_search.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_add.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_menu_bookmark_add.png rename to mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_add.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_remove.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_menu_bookmark_remove.png rename to mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_remove.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_menu_find_in_page.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_find_in_page.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_menu_find_in_page.png rename to mobile/android/base/resources/drawable-hdpi/ic_menu_find_in_page.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_menu_forward.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_forward.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_menu_forward.png rename to mobile/android/base/resources/drawable-hdpi/ic_menu_forward.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_menu_reload.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_reload.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_menu_reload.png rename to mobile/android/base/resources/drawable-hdpi/ic_menu_reload.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_menu_save_as_pdf.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_save_as_pdf.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_menu_save_as_pdf.png rename to mobile/android/base/resources/drawable-hdpi/ic_menu_save_as_pdf.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/ic_menu_share.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_share.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/ic_menu_share.png rename to mobile/android/base/resources/drawable-hdpi/ic_menu_share.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/site_security_identified.png b/mobile/android/base/resources/drawable-hdpi/site_security_identified.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/site_security_identified.png rename to mobile/android/base/resources/drawable-hdpi/site_security_identified.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/site_security_verified.png b/mobile/android/base/resources/drawable-hdpi/site_security_verified.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/site_security_verified.png rename to mobile/android/base/resources/drawable-hdpi/site_security_verified.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tab_close.png b/mobile/android/base/resources/drawable-hdpi/tab_close.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tab_close.png rename to mobile/android/base/resources/drawable-hdpi/tab_close.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tab_new.png b/mobile/android/base/resources/drawable-hdpi/tab_new.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tab_new.png rename to mobile/android/base/resources/drawable-hdpi/tab_new.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tab_selected.png b/mobile/android/base/resources/drawable-hdpi/tab_selected.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tab_selected.png rename to mobile/android/base/resources/drawable-hdpi/tab_selected.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tab_thumbnail_default.png b/mobile/android/base/resources/drawable-hdpi/tab_thumbnail_default.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tab_thumbnail_default.png rename to mobile/android/base/resources/drawable-hdpi/tab_thumbnail_default.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tab_thumbnail_shadow.png b/mobile/android/base/resources/drawable-hdpi/tab_thumbnail_shadow.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tab_thumbnail_shadow.png rename to mobile/android/base/resources/drawable-hdpi/tab_thumbnail_shadow.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tabs_more.png b/mobile/android/base/resources/drawable-hdpi/tabs_more.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tabs_more.png rename to mobile/android/base/resources/drawable-hdpi/tabs_more.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tabs_normal.png b/mobile/android/base/resources/drawable-hdpi/tabs_normal.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tabs_normal.png rename to mobile/android/base/resources/drawable-hdpi/tabs_normal.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tabs_plus.png b/mobile/android/base/resources/drawable-hdpi/tabs_plus.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tabs_plus.png rename to mobile/android/base/resources/drawable-hdpi/tabs_plus.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/tabs_pressed.png b/mobile/android/base/resources/drawable-hdpi/tabs_pressed.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/tabs_pressed.png rename to mobile/android/base/resources/drawable-hdpi/tabs_pressed.png diff --git a/mobile/android/base/resources/drawable-hdpi-v8/urlbar_stop.png b/mobile/android/base/resources/drawable-hdpi/urlbar_stop.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi-v8/urlbar_stop.png rename to mobile/android/base/resources/drawable-hdpi/urlbar_stop.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/abouthome_icon.png b/mobile/android/base/resources/drawable/abouthome_icon.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/abouthome_icon.png rename to mobile/android/base/resources/drawable/abouthome_icon.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/abouthome_logo.png b/mobile/android/base/resources/drawable/abouthome_logo.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/abouthome_logo.png rename to mobile/android/base/resources/drawable/abouthome_logo.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/abouthome_separator.9.png b/mobile/android/base/resources/drawable/abouthome_separator.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/abouthome_separator.9.png rename to mobile/android/base/resources/drawable/abouthome_separator.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/abouthome_sync_bg.9.png b/mobile/android/base/resources/drawable/abouthome_sync_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/abouthome_sync_bg.9.png rename to mobile/android/base/resources/drawable/abouthome_sync_bg.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/abouthome_sync_logo.png b/mobile/android/base/resources/drawable/abouthome_sync_logo.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/abouthome_sync_logo.png rename to mobile/android/base/resources/drawable/abouthome_sync_logo.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/abouthome_sync_pressed_bg.9.png b/mobile/android/base/resources/drawable/abouthome_sync_pressed_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/abouthome_sync_pressed_bg.9.png rename to mobile/android/base/resources/drawable/abouthome_sync_pressed_bg.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/abouthome_topsite_placeholder.png b/mobile/android/base/resources/drawable/abouthome_topsite_placeholder.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/abouthome_topsite_placeholder.png rename to mobile/android/base/resources/drawable/abouthome_topsite_placeholder.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/abouthome_topsite_shadow.9.png b/mobile/android/base/resources/drawable/abouthome_topsite_shadow.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/abouthome_topsite_shadow.9.png rename to mobile/android/base/resources/drawable/abouthome_topsite_shadow.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/address_bar_texture.png b/mobile/android/base/resources/drawable/address_bar_texture.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/address_bar_texture.png rename to mobile/android/base/resources/drawable/address_bar_texture.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/address_bar_url_bg.9.png b/mobile/android/base/resources/drawable/address_bar_url_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/address_bar_url_bg.9.png rename to mobile/android/base/resources/drawable/address_bar_url_bg.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/address_bar_url_outline.9.png b/mobile/android/base/resources/drawable/address_bar_url_outline.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/address_bar_url_outline.9.png rename to mobile/android/base/resources/drawable/address_bar_url_outline.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab.9.png b/mobile/android/base/resources/drawable/awesomebar_tab.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab.9.png rename to mobile/android/base/resources/drawable/awesomebar_tab.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab_pressed.9.png b/mobile/android/base/resources/drawable/awesomebar_tab_pressed.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab_pressed.9.png rename to mobile/android/base/resources/drawable/awesomebar_tab_pressed.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/doorhanger_arrow.png b/mobile/android/base/resources/drawable/doorhanger_arrow.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/doorhanger_arrow.png rename to mobile/android/base/resources/drawable/doorhanger_arrow.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/doorhanger_bg.9.png b/mobile/android/base/resources/drawable/doorhanger_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/doorhanger_bg.9.png rename to mobile/android/base/resources/drawable/doorhanger_bg.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/doorhanger_popup_bg.9.png b/mobile/android/base/resources/drawable/doorhanger_popup_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/doorhanger_popup_bg.9.png rename to mobile/android/base/resources/drawable/doorhanger_popup_bg.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/doorhanger_shadow_bg.9.png b/mobile/android/base/resources/drawable/doorhanger_shadow_bg.9.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/doorhanger_shadow_bg.9.png rename to mobile/android/base/resources/drawable/doorhanger_shadow_bg.9.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/favicon.png b/mobile/android/base/resources/drawable/favicon.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/favicon.png rename to mobile/android/base/resources/drawable/favicon.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_addons_empty.png b/mobile/android/base/resources/drawable/ic_addons_empty.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_addons_empty.png rename to mobile/android/base/resources/drawable/ic_addons_empty.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_awesomebar_go.png b/mobile/android/base/resources/drawable/ic_awesomebar_go.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_awesomebar_go.png rename to mobile/android/base/resources/drawable/ic_awesomebar_go.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_awesomebar_search.png b/mobile/android/base/resources/drawable/ic_awesomebar_search.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_awesomebar_search.png rename to mobile/android/base/resources/drawable/ic_awesomebar_search.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable/ic_menu_bookmark_add.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_menu_bookmark_add.png rename to mobile/android/base/resources/drawable/ic_menu_bookmark_add.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable/ic_menu_bookmark_remove.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_menu_bookmark_remove.png rename to mobile/android/base/resources/drawable/ic_menu_bookmark_remove.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_menu_find_in_page.png b/mobile/android/base/resources/drawable/ic_menu_find_in_page.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_menu_find_in_page.png rename to mobile/android/base/resources/drawable/ic_menu_find_in_page.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_menu_forward.png b/mobile/android/base/resources/drawable/ic_menu_forward.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_menu_forward.png rename to mobile/android/base/resources/drawable/ic_menu_forward.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_menu_reload.png b/mobile/android/base/resources/drawable/ic_menu_reload.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_menu_reload.png rename to mobile/android/base/resources/drawable/ic_menu_reload.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_menu_save_as_pdf.png b/mobile/android/base/resources/drawable/ic_menu_save_as_pdf.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_menu_save_as_pdf.png rename to mobile/android/base/resources/drawable/ic_menu_save_as_pdf.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/ic_menu_share.png b/mobile/android/base/resources/drawable/ic_menu_share.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/ic_menu_share.png rename to mobile/android/base/resources/drawable/ic_menu_share.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/site_security_identified.png b/mobile/android/base/resources/drawable/site_security_identified.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/site_security_identified.png rename to mobile/android/base/resources/drawable/site_security_identified.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/site_security_verified.png b/mobile/android/base/resources/drawable/site_security_verified.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/site_security_verified.png rename to mobile/android/base/resources/drawable/site_security_verified.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tab_close.png b/mobile/android/base/resources/drawable/tab_close.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tab_close.png rename to mobile/android/base/resources/drawable/tab_close.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tab_new.png b/mobile/android/base/resources/drawable/tab_new.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tab_new.png rename to mobile/android/base/resources/drawable/tab_new.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tab_selected.png b/mobile/android/base/resources/drawable/tab_selected.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tab_selected.png rename to mobile/android/base/resources/drawable/tab_selected.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tab_thumbnail_default.png b/mobile/android/base/resources/drawable/tab_thumbnail_default.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tab_thumbnail_default.png rename to mobile/android/base/resources/drawable/tab_thumbnail_default.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tab_thumbnail_shadow.png b/mobile/android/base/resources/drawable/tab_thumbnail_shadow.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tab_thumbnail_shadow.png rename to mobile/android/base/resources/drawable/tab_thumbnail_shadow.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tabs_more.png b/mobile/android/base/resources/drawable/tabs_more.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tabs_more.png rename to mobile/android/base/resources/drawable/tabs_more.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tabs_normal.png b/mobile/android/base/resources/drawable/tabs_normal.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tabs_normal.png rename to mobile/android/base/resources/drawable/tabs_normal.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tabs_plus.png b/mobile/android/base/resources/drawable/tabs_plus.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tabs_plus.png rename to mobile/android/base/resources/drawable/tabs_plus.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/tabs_pressed.png b/mobile/android/base/resources/drawable/tabs_pressed.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/tabs_pressed.png rename to mobile/android/base/resources/drawable/tabs_pressed.png diff --git a/mobile/android/base/resources/drawable-mdpi-v8/urlbar_stop.png b/mobile/android/base/resources/drawable/urlbar_stop.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi-v8/urlbar_stop.png rename to mobile/android/base/resources/drawable/urlbar_stop.png