diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index deb69af4965..e712654f1ab 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3154,6 +3154,7 @@ public class BrowserApp extends GeckoApp } Tab tab = Tabs.getInstance().getSelectedTab(); + // Unlike other menu items, the bookmark star is not tinted. See {@link ThemedImageButton#setTintedDrawable}. final MenuItem bookmark = aMenu.findItem(R.id.bookmark); final MenuItem reader = aMenu.findItem(R.id.reading_list); final MenuItem back = aMenu.findItem(R.id.back); @@ -3387,7 +3388,7 @@ public class BrowserApp extends GeckoApp private int resolveBookmarkIconID(final boolean isBookmark) { if (isBookmark) { - return R.drawable.ic_menu_bookmark_remove; + return R.drawable.star_blue; } else { return R.drawable.ic_menu_bookmark_add; } diff --git a/mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java b/mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java index a91eee3fdd5..2c564f3f912 100644 --- a/mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java +++ b/mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java @@ -177,9 +177,11 @@ public class ThemedImageButton extends android.widget.ImageButton private void setTintedImageDrawable(final Drawable drawable) { final Drawable tintedDrawable; - if (drawableColors == null) { - // If we tint a drawable with a null ColorStateList, it will override + if (drawableColors == null || R.id.bookmark == getId()) { + // NB: If we tint a drawable with a null ColorStateList, it will override // any existing colorFilters and tint... so don't! + + // NB: The bookmarked state uses a blue star, so this is a hack to keep it from being tinted. tintedDrawable = drawable; } else if (drawable == null) { tintedDrawable = null; diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 09be9ac33e5..00000000000 Binary files a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-hdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-hdpi-v11/star_blue.png new file mode 100644 index 00000000000..65b7bf3b86e Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v11/star_blue.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 12b161c8f88..00000000000 Binary files a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png new file mode 100644 index 00000000000..661441d2408 Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png differ diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 27d882b83cf..00000000000 Binary files a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.png new file mode 100644 index 00000000000..b80c5ac44b9 Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.png differ diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png deleted file mode 100644 index b9159d68415..00000000000 Binary files a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 19e845c6a3e..00000000000 Binary files a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 13bf851b0df..00000000000 Binary files a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png new file mode 100644 index 00000000000..c0278d5748c Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png differ diff --git a/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index 42d1f962259..00000000000 Binary files a/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_remove.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.png new file mode 100644 index 00000000000..c9cf4962208 Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.png differ diff --git a/mobile/android/base/resources/drawable-xxhdpi-v11/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xxhdpi-v11/ic_menu_bookmark_remove.png deleted file mode 100644 index a61b15b0445..00000000000 Binary files a/mobile/android/base/resources/drawable-xxhdpi-v11/ic_menu_bookmark_remove.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xxhdpi-v11/star_blue.png b/mobile/android/base/resources/drawable-xxhdpi-v11/star_blue.png new file mode 100644 index 00000000000..24862d5233f Binary files /dev/null and b/mobile/android/base/resources/drawable-xxhdpi-v11/star_blue.png differ