Bug 1227120 - Filled bookmark star does not easily convey bookmarked state. r=mcomella

MozReview-Commit-ID: 8fSQiEycSGl

--HG--
extra : rebase_source : 622ff00e8c0a2da2a5905af8c351287c47da954b
extra : histedit_source : 456adae60c98d8fd93153ef1c9aa7e284181540e

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;
         }

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;