Bug 822422: Firefox wordmark should be in white for dark themes. [r=mfinkle] [needs-clobber]
--HG-- rename : mobile/android/base/resources/drawable-hdpi/abouthome_logo.png => mobile/android/base/resources/drawable-hdpi/abouthome_logo_dark.png rename : mobile/android/base/resources/drawable-xhdpi/abouthome_logo.png => mobile/android/base/resources/drawable-xhdpi/abouthome_logo_dark.png rename : mobile/android/base/resources/drawable/abouthome_logo.png => mobile/android/base/resources/drawable/abouthome_logo_dark.png extra : rebase_source : bec6cb4ab6bc58d4c0a364a74a1ec09c00cf623e
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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 \
|
||||
|
|
До Ширина: | Высота: | Размер: 1.4 KiB После Ширина: | Высота: | Размер: 1.4 KiB |
После Ширина: | Высота: | Размер: 2.2 KiB |
До Ширина: | Высота: | Размер: 1.8 KiB После Ширина: | Высота: | Размер: 1.8 KiB |
После Ширина: | Высота: | Размер: 2.6 KiB |
|
@ -0,0 +1,19 @@
|
|||
#filter substitution
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 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/. -->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
|
||||
|
||||
<!-- dark theme -->
|
||||
<item gecko:state_dark="true" android:drawable="@drawable/abouthome_logo_light" />
|
||||
|
||||
<!-- light theme -->
|
||||
<item gecko:state_light="true" android:drawable="@drawable/abouthome_logo_dark" />
|
||||
|
||||
<!-- default -->
|
||||
<item android:drawable="@drawable/abouthome_logo_dark" />
|
||||
|
||||
</selector>
|
До Ширина: | Высота: | Размер: 984 B После Ширина: | Высота: | Размер: 984 B |
После Ширина: | Высота: | Размер: 1.7 KiB |
|
@ -18,7 +18,8 @@
|
|||
android:layout_marginLeft="@dimen/abouthome_gutter_large"
|
||||
android:layout_marginRight="@dimen/abouthome_gutter_small">
|
||||
|
||||
<ImageView android:src="@drawable/abouthome_logo"
|
||||
<Gecko.ImageView android:id="@+id/abouthome_logo"
|
||||
android:src="@drawable/abouthome_logo"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="24dip"
|
||||
android:layout_marginTop="16dip"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
android:paddingLeft="@dimen/abouthome_gutter_large"
|
||||
android:paddingRight="@dimen/abouthome_gutter_large">
|
||||
|
||||
<ImageView android:id="@+id/abouthome_logo"
|
||||
<Gecko.ImageView android:id="@+id/abouthome_logo"
|
||||
android:src="@drawable/abouthome_logo"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="24dip"
|
||||
|
|