diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index ac8a6926489..d8f946d64d5 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -352,7 +352,7 @@ RES_DRAWABLE_BASE = \ 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_texture_port.png \ res/drawable/address_bar_url_bg.9.png \ res/drawable/address_bar_url_outline.9.png \ res/drawable/doorhanger_arrow.png \ @@ -404,7 +404,7 @@ RES_DRAWABLE_HDPI = \ 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_texture_port.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 \ @@ -467,7 +467,7 @@ RES_DRAWABLE_XHDPI_V11 = \ res/drawable-xhdpi-v11/tabs_pressed.png \ res/drawable-xhdpi-v11/tabs_more.png \ res/drawable-xhdpi-v11/tabs_plus.png \ - res/drawable-xhdpi-v11/address_bar_texture.png \ + res/drawable-xhdpi-v11/address_bar_texture_port.png \ res/drawable-xhdpi-v11/address_bar_url_bg.9.png \ res/drawable-xhdpi-v11/address_bar_url_outline.9.png \ res/drawable-xhdpi-v11/urlbar_stop.png \ @@ -476,10 +476,14 @@ RES_DRAWABLE_XHDPI_V11 = \ res/drawable-xhdpi-v11/tabs_button_tail.9.png \ $(NULL) +RES_DRAWABLE_LAND_V14 = \ + res/drawable-land-v14/address_bar_bg.xml \ + $(NULL) + RES_DRAWABLE_LAND_MDPI_V14 = \ res/drawable-land-mdpi-v14/ic_awesomebar_go.png \ res/drawable-land-mdpi-v14/ic_awesomebar_search.png \ - res/drawable-land-mdpi-v14/address_bar_texture.png \ + res/drawable-land-mdpi-v14/address_bar_texture_land.png \ res/drawable-land-mdpi-v14/address_bar_url_bg.9.png \ res/drawable-land-mdpi-v14/address_bar_url_outline.9.png \ res/drawable-land-mdpi-v14/tabs_normal.png \ @@ -494,7 +498,7 @@ RES_DRAWABLE_LAND_MDPI_V14 = \ RES_DRAWABLE_LAND_HDPI_V14 = \ res/drawable-land-hdpi-v14/ic_awesomebar_go.png \ res/drawable-land-hdpi-v14/ic_awesomebar_search.png \ - res/drawable-land-hdpi-v14/address_bar_texture.png \ + res/drawable-land-hdpi-v14/address_bar_texture_land.png \ res/drawable-land-hdpi-v14/address_bar_url_bg.9.png \ res/drawable-land-hdpi-v14/address_bar_url_outline.9.png \ res/drawable-land-hdpi-v14/tabs_normal.png \ @@ -509,7 +513,7 @@ RES_DRAWABLE_LAND_HDPI_V14 = \ RES_DRAWABLE_LAND_XHDPI_V14 = \ res/drawable-land-xhdpi-v14/ic_awesomebar_go.png \ res/drawable-land-xhdpi-v14/ic_awesomebar_search.png \ - res/drawable-land-xhdpi-v14/address_bar_texture.png \ + res/drawable-land-xhdpi-v14/address_bar_texture_land.png \ res/drawable-land-xhdpi-v14/address_bar_url_bg.9.png \ res/drawable-land-xhdpi-v14/address_bar_url_outline.9.png \ res/drawable-land-xhdpi-v14/tabs_normal.png \ @@ -589,7 +593,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_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) +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_V14) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_COLOR) $(RES_MENU) RES_DIRS= \ res/layout \ @@ -609,6 +613,7 @@ RES_DIRS= \ res/drawable-mdpi-v11 \ res/drawable-hdpi-v11 \ res/drawable-xhdpi-v11 \ + res/drawable-land-v14 \ res/drawable-land-mdpi-v14 \ res/drawable-land-hdpi-v14 \ res/drawable-land-xhdpi-v14 \ diff --git a/mobile/android/base/resources/drawable-hdpi/address_bar_texture.png b/mobile/android/base/resources/drawable-hdpi/address_bar_texture_port.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi/address_bar_texture.png rename to mobile/android/base/resources/drawable-hdpi/address_bar_texture_port.png diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture.png b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture.png deleted file mode 100644 index 36e9706dfc7..00000000000 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture_land.png b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture_land.png new file mode 100644 index 00000000000..1ce11734acb Binary files /dev/null and b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture_land.png differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/tabs_normal.png b/mobile/android/base/resources/drawable-land-hdpi-v14/tabs_normal.png index c7ba8d8e738..8dba0496369 100644 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/tabs_normal.png and b/mobile/android/base/resources/drawable-land-hdpi-v14/tabs_normal.png differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/tabs_pressed.png b/mobile/android/base/resources/drawable-land-hdpi-v14/tabs_pressed.png index 6ad947c446e..db791bfe5c9 100644 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/tabs_pressed.png and b/mobile/android/base/resources/drawable-land-hdpi-v14/tabs_pressed.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture.png b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture.png deleted file mode 100644 index 0595d17f7ba..00000000000 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture_land.png b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture_land.png new file mode 100644 index 00000000000..8d557c0f37b Binary files /dev/null and b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture_land.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/tabs_normal.png b/mobile/android/base/resources/drawable-land-mdpi-v14/tabs_normal.png index aef2b0ab936..dbfba2b3557 100644 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/tabs_normal.png and b/mobile/android/base/resources/drawable-land-mdpi-v14/tabs_normal.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/tabs_pressed.png b/mobile/android/base/resources/drawable-land-mdpi-v14/tabs_pressed.png index e4d2d191303..677dcacfe96 100644 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/tabs_pressed.png and b/mobile/android/base/resources/drawable-land-mdpi-v14/tabs_pressed.png differ diff --git a/mobile/android/base/resources/drawable-land-v14/address_bar_bg.xml b/mobile/android/base/resources/drawable-land-v14/address_bar_bg.xml new file mode 100644 index 00000000000..e561a0068d5 --- /dev/null +++ b/mobile/android/base/resources/drawable-land-v14/address_bar_bg.xml @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture.png deleted file mode 100644 index f83e2c62622..00000000000 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture_land.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture_land.png new file mode 100644 index 00000000000..2cea1f0f3b3 Binary files /dev/null and b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture_land.png differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_normal.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_normal.png index 795d9aa59b5..a5480fc747a 100644 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_normal.png and b/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_normal.png differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_pressed.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_pressed.png index 8ddd0bd2678..10e12290f7f 100644 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_pressed.png and b/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_pressed.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_texture.png b/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_texture_port.png similarity index 100% rename from mobile/android/base/resources/drawable-xhdpi-v11/address_bar_texture.png rename to mobile/android/base/resources/drawable-xhdpi-v11/address_bar_texture_port.png diff --git a/mobile/android/base/resources/drawable/address_bar_bg.xml b/mobile/android/base/resources/drawable/address_bar_bg.xml index 8ea0341968b..f522250a72f 100644 --- a/mobile/android/base/resources/drawable/address_bar_bg.xml +++ b/mobile/android/base/resources/drawable/address_bar_bg.xml @@ -3,7 +3,7 @@ diff --git a/mobile/android/base/resources/drawable/address_bar_texture.png b/mobile/android/base/resources/drawable/address_bar_texture_port.png similarity index 100% rename from mobile/android/base/resources/drawable/address_bar_texture.png rename to mobile/android/base/resources/drawable/address_bar_texture_port.png