Bug 1177166 - Remove duplicate favicon_search & suggestion_item_search icons. r=jonalmeida
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 24 Jun 2015 12:45:36 -0700
changeset 250186 af86cc9586aaa84e3be04d1c75f39de84c17f107
parent 250185 84107b0b841924fb9f99599d3ca620066253a427
child 250187 aacb3d4718c1240caa23c1d16f90fbb468181c5b
push id61471
push usercbook@mozilla.com
push dateThu, 25 Jun 2015 09:33:34 +0000
treeherdermozilla-inbound@5b38df79819f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjonalmeida
bugs1177166
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1177166 - Remove duplicate favicon_search & suggestion_item_search icons. r=jonalmeida The icons are now called search_icon_inactive.
mobile/android/base/favicons/Favicons.java
mobile/android/base/home/SearchEngine.java
mobile/android/base/resources/drawable-hdpi/favicon_search.png
mobile/android/base/resources/drawable-hdpi/suggestion_item_search.png
mobile/android/base/resources/drawable-mdpi/favicon_search.png
mobile/android/base/resources/drawable-mdpi/suggestion_item_search.png
mobile/android/base/resources/drawable-xhdpi/favicon_search.png
mobile/android/base/resources/drawable-xhdpi/suggestion_item_search.png
mobile/android/base/resources/drawable-xxhdpi/favicon_search.png
mobile/android/base/resources/drawable-xxhdpi/suggestion_item_search.png
mobile/android/base/resources/layout/suggestion_item.xml
--- a/mobile/android/base/favicons/Favicons.java
+++ b/mobile/android/base/favicons/Favicons.java
@@ -476,17 +476,17 @@ public class Favicons {
         // Load and cache the built-in favicon in each of its sizes.
         // TODO: don't open the zip twice!
         List<Bitmap> toInsert = Arrays.asList(loadBrandingBitmap(context, "favicon64.png"),
                                               loadBrandingBitmap(context, "favicon32.png"));
 
         putFaviconsInMemCache(BUILT_IN_FAVICON_URL, toInsert.iterator(), true);
 
         pageURLMappings.putWithoutEviction(AboutPages.HOME, BUILT_IN_SEARCH_URL);
-        List<Bitmap> searchIcons = Collections.singletonList(BitmapFactory.decodeResource(res, R.drawable.favicon_search));
+        List<Bitmap> searchIcons = Collections.singletonList(BitmapFactory.decodeResource(res, R.drawable.search_icon_inactive));
         putFaviconsInMemCache(BUILT_IN_SEARCH_URL, searchIcons.iterator(), true);
     }
 
     /**
      * Compute a string like:
      * "jar:jar:file:///data/app/org.mozilla.firefox-1.apk!/assets/omni.ja!/chrome/chrome/content/branding/favicon64.png"
      */
     private static String getBrandingBitmapPath(Context context, String name) {
--- a/mobile/android/base/home/SearchEngine.java
+++ b/mobile/android/base/home/SearchEngine.java
@@ -45,17 +45,17 @@ public class SearchEngine {
             Log.w(LOG_TAG, "iconURI is null for search engine " + this.name);
         }
         final Bitmap tempIcon = BitmapUtils.getBitmapFromDataURI(iconURI);
 
         this.icon = (tempIcon != null) ? tempIcon : getDefaultFavicon(context);
     }
 
     private Bitmap getDefaultFavicon(final Context context) {
-        return BitmapFactory.decodeResource(context.getResources(), R.drawable.favicon_search);
+        return BitmapFactory.decodeResource(context.getResources(), R.drawable.search_icon_inactive);
     }
 
     private static String getString(JSONObject data, String key) throws JSONException {
         if (data.isNull(key)) {
             return null;
         }
         return data.getString(key);
     }
deleted file mode 100644
index 8ce678fd3d52128e63b951341b7f2d09d5c541d6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8ce678fd3d52128e63b951341b7f2d09d5c541d6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index c8f027fafae425357a68d95104182d4aba99db22..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 72ee98d1e97a3c5bb8787bf8d0c8f3ad5f3bb30f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d720c78b3bf0112821186ea79dab06ab03f7f72d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 21d7f6545db9653d20b5f8f415c53d40580b180e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 837a3cb18b280c162efacb43172b3eb4a93e2c7b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e4a384991a02515ebfd4b2acfe037d4050d5bf83..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/base/resources/layout/suggestion_item.xml
+++ b/mobile/android/base/resources/layout/suggestion_item.xml
@@ -8,17 +8,17 @@
               android:layout_height="wrap_content"
               android:orientation="horizontal"
               android:background="@drawable/suggestion_selector"
               android:gravity="center_vertical"
               android:clickable="true"
               android:padding="7dp">
 
     <ImageView android:id="@+id/suggestion_magnifier"
-               android:src="@drawable/suggestion_item_search"
+               android:src="@drawable/search_icon_inactive"
                android:layout_marginRight="3dip"
                android:layout_width="16dip"
                android:layout_height="16dip"/>
 
     <TextView android:id="@+id/suggestion_text"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:textColor="@color/placeholder_active_grey"