WIP: Bug 1314902 - Replace ic_menu_bookmark with as_bookmark draft
authorAndrzej Hunt <ahunt@mozilla.com>
Fri, 21 Oct 2016 15:35:49 -0700
changeset 433293 856ea6e0e5bb0c905a74960359c816094067ab96
parent 433292 ee8f7385f9e6b9fe4c938cc8cc39ed3baf2a712f
child 433294 e9ed8bd813649776a7eb7c67275abdb1dd2f8d12
push id34531
push userahunt@mozilla.com
push dateThu, 03 Nov 2016 10:54:02 +0000
bugs1314902
milestone52.0a1
WIP: Bug 1314902 - Replace ic_menu_bookmark with as_bookmark The vector icon is slightly fatter, we also need to tint it for the main menu. It would also be good to replace the filled star with a VectorDrawable. MozReview-Commit-ID: G05bmSLtxSn
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png
mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png
mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png
mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png
mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_add.png
mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml
mobile/android/base/resources/menu-large/browser_app_menu.xml
mobile/android/base/resources/menu-xlarge/browser_app_menu.xml
mobile/android/base/resources/menu/browser_app_menu.xml
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3609,17 +3609,17 @@ public class BrowserApp extends GeckoApp
 
         return true;
     }
 
     private int resolveBookmarkIconID(final boolean isBookmark) {
         if (isBookmark) {
             return R.drawable.star_blue;
         } else {
-            return R.drawable.ic_menu_bookmark_add;
+            return R.drawable.as_bookmark;
         }
     }
 
     private int resolveBookmarkTitleID(final boolean isBookmark) {
         return (isBookmark ? R.string.bookmark_remove : R.string.bookmark);
     }
 
     @Override
deleted file mode 100644
index a58abd2f1480f1433577590f010a807232c0b59e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8084baf9847fdfaf2092edd840fec00d46f62918..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 54d88fd13aa85da0699d63021e2f27028d34dbdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e54d42905bbaee8705c44cae962046b6814b2edb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0fa0711374b82191fd94177a29b7c727e1d27194..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/. -->
-
-<!-- This asset is properly available in large-* dirs so this null
-     reference exists for build time on API 9 builds. -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-    <solid android:color="@android:color/transparent"/>
-
-</shape>
--- a/mobile/android/base/resources/menu-large/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-large/browser_app_menu.xml
@@ -20,17 +20,17 @@
           android:visible="false"/>
 
     <item android:id="@+id/forward"
           android:icon="@drawable/ic_menu_forward"
           android:title="@string/forward"
           android:visible="false"/>
 
     <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
+          android:icon="@drawable/as_bookmark"
           android:title="@string/bookmark"
           android:showAsAction="ifRoom"/>
 
     <item android:id="@+id/share"
           android:icon="@drawable/as_share"
           android:title="@string/share"
           android:showAsAction="ifRoom"/>
 
--- a/mobile/android/base/resources/menu-xlarge/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-xlarge/browser_app_menu.xml
@@ -20,17 +20,17 @@
           android:visible="false"/>
 
     <item android:id="@+id/forward"
           android:icon="@drawable/ic_menu_forward"
           android:title="@string/forward"
           android:visible="false"/>
 
     <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
+          android:icon="@drawable/as_bookmark"
           android:title="@string/bookmark"
           android:showAsAction="always"/>
 
     <item android:id="@+id/share"
           android:icon="@drawable/as_share"
           android:title="@string/share"
           android:showAsAction="ifRoom"/>
 
--- a/mobile/android/base/resources/menu/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu/browser_app_menu.xml
@@ -15,17 +15,17 @@
           android:showAsAction="always"/>
 
     <item android:id="@+id/forward"
           android:icon="@drawable/ic_menu_forward"
           android:title="@string/forward"
           android:showAsAction="always"/>
 
     <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
+          android:icon="@drawable/as_bookmark"
           android:title="@string/bookmark"
           android:showAsAction="always"/>
 
     <item android:id="@+id/reload"
           android:icon="@drawable/ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>