diff --git a/mobile/android/base/AboutHomeContent.java b/mobile/android/base/AboutHomeContent.java index 1e85cc2289c..5ad0fc9e55f 100644 --- a/mobile/android/base/AboutHomeContent.java +++ b/mobile/android/base/AboutHomeContent.java @@ -696,6 +696,7 @@ public class AboutHomeContent extends ScrollView mAddons.setTheme(isLight); mLastTabs.setTheme(isLight); mRemoteTabs.setTheme(isLight); + ((GeckoImageView) findViewById(R.id.abouthome_logo)).setTheme(isLight); ((GeckoTextView) findViewById(R.id.top_sites_title)).setTheme(isLight); } } @@ -708,6 +709,7 @@ public class AboutHomeContent extends ScrollView mAddons.resetTheme(); mLastTabs.resetTheme(); mRemoteTabs.resetTheme(); + ((GeckoImageView) findViewById(R.id.abouthome_logo)).resetTheme(); ((GeckoTextView) findViewById(R.id.top_sites_title)).resetTheme(); } } diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 5aede8fed94..234c9b6066d 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -232,6 +232,7 @@ FENNEC_PP_XML_FILES = \ res/color/abouthome_section_title.xml \ res/color/awesome_bar_title.xml \ res/color/awesome_bar_title_hint.xml \ + res/drawable/abouthome_logo.xml \ res/drawable/address_bar_bg.xml \ res/drawable/address_bar_nav_button.xml \ res/drawable/address_bar_url.xml \ @@ -500,7 +501,8 @@ RES_DRAWABLE_BASE = \ res/drawable/favicon.png \ res/drawable/folder.png \ res/drawable/abouthome_icon.png \ - res/drawable/abouthome_logo.png \ + res/drawable/abouthome_logo_dark.png \ + res/drawable/abouthome_logo_light.png \ res/drawable/abouthome_promo_box_bg.9.png \ res/drawable/abouthome_promo_box_pressed_bg.9.png \ res/drawable/abouthome_promo_logo_apps.png \ @@ -589,7 +591,8 @@ RES_DRAWABLE_HDPI = \ 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_logo_dark.png \ + res/drawable-hdpi/abouthome_logo_light.png \ res/drawable-hdpi/abouthome_promo_box_bg.9.png \ res/drawable-hdpi/abouthome_promo_box_pressed_bg.9.png \ res/drawable-hdpi/abouthome_promo_logo_apps.png \ @@ -668,7 +671,8 @@ RES_DRAWABLE_XHDPI = \ res/drawable-xhdpi/favicon.png \ res/drawable-xhdpi/folder.png \ res/drawable-xhdpi/abouthome_icon.png \ - res/drawable-xhdpi/abouthome_logo.png \ + res/drawable-xhdpi/abouthome_logo_dark.png \ + res/drawable-xhdpi/abouthome_logo_light.png \ res/drawable-xhdpi/abouthome_promo_box_bg.9.png \ res/drawable-xhdpi/abouthome_promo_box_pressed_bg.9.png \ res/drawable-xhdpi/abouthome_promo_logo_apps.png \ diff --git a/mobile/android/base/resources/drawable-hdpi/abouthome_logo.png b/mobile/android/base/resources/drawable-hdpi/abouthome_logo_dark.png similarity index 100% rename from mobile/android/base/resources/drawable-hdpi/abouthome_logo.png rename to mobile/android/base/resources/drawable-hdpi/abouthome_logo_dark.png diff --git a/mobile/android/base/resources/drawable-hdpi/abouthome_logo_light.png b/mobile/android/base/resources/drawable-hdpi/abouthome_logo_light.png new file mode 100644 index 00000000000..15bdd9280db Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/abouthome_logo_light.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/abouthome_logo.png b/mobile/android/base/resources/drawable-xhdpi/abouthome_logo_dark.png similarity index 100% rename from mobile/android/base/resources/drawable-xhdpi/abouthome_logo.png rename to mobile/android/base/resources/drawable-xhdpi/abouthome_logo_dark.png diff --git a/mobile/android/base/resources/drawable-xhdpi/abouthome_logo_light.png b/mobile/android/base/resources/drawable-xhdpi/abouthome_logo_light.png new file mode 100644 index 00000000000..e07197aadbc Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/abouthome_logo_light.png differ diff --git a/mobile/android/base/resources/drawable/abouthome_logo.xml.in b/mobile/android/base/resources/drawable/abouthome_logo.xml.in new file mode 100644 index 00000000000..fe919b868a5 --- /dev/null +++ b/mobile/android/base/resources/drawable/abouthome_logo.xml.in @@ -0,0 +1,19 @@ +#filter substitution + + + + + + + + + + + + + + + diff --git a/mobile/android/base/resources/drawable/abouthome_logo.png b/mobile/android/base/resources/drawable/abouthome_logo_dark.png similarity index 100% rename from mobile/android/base/resources/drawable/abouthome_logo.png rename to mobile/android/base/resources/drawable/abouthome_logo_dark.png diff --git a/mobile/android/base/resources/drawable/abouthome_logo_light.png b/mobile/android/base/resources/drawable/abouthome_logo_light.png new file mode 100644 index 00000000000..6a4bfaad4bd Binary files /dev/null and b/mobile/android/base/resources/drawable/abouthome_logo_light.png differ diff --git a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in index 9b2633d2ae3..e3866f88247 100644 --- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in +++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in @@ -18,12 +18,13 @@ android:layout_marginLeft="@dimen/abouthome_gutter_large" android:layout_marginRight="@dimen/abouthome_gutter_small"> - + - +