From 2d025d29a9120f34f3ad6362e94f2ef21d2269e7 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 17 Nov 2015 17:03:07 -0800
Subject: [PATCH] Bug 1209967 - Remove android:icons from GB menu. r=sebastian

ic_menu_back was not in the v11 folder so I moved the all-API asset to the v11
folder.

--HG--
rename : mobile/android/base/resources/drawable-hdpi/ic_menu_back.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
rename : mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
extra : commitid : ASnzeySsrYa
extra : rebase_source : ede08d251cbcd03a74dfdca02627229e8dd0aa8a
---
 mobile/android/base/BrowserApp.java           |  30 ++++++++++++++----
 .../ic_menu_back.png                          | Bin
 .../drawable-hdpi/ic_menu_bookmark_add.png    | Bin 1149 -> 0 bytes
 .../drawable-hdpi/ic_menu_bookmark_remove.png | Bin 1710 -> 0 bytes
 .../drawable-hdpi/ic_menu_forward.png         | Bin 606 -> 0 bytes
 .../drawable-hdpi/ic_menu_new_private_tab.png | Bin 1186 -> 0 bytes
 .../drawable-hdpi/ic_menu_new_tab.png         | Bin 480 -> 0 bytes
 .../drawable-hdpi/ic_menu_reload.png          | Bin 1146 -> 0 bytes
 .../ic_menu_back.png                          | Bin
 .../drawable-xhdpi/ic_menu_bookmark_add.png   | Bin 1753 -> 0 bytes
 .../ic_menu_bookmark_remove.png               | Bin 2176 -> 0 bytes
 .../drawable-xhdpi/ic_menu_forward.png        | Bin 790 -> 0 bytes
 .../ic_menu_new_private_tab.png               | Bin 1599 -> 0 bytes
 .../drawable-xhdpi/ic_menu_new_tab.png        | Bin 620 -> 0 bytes
 .../drawable-xhdpi/ic_menu_reload.png         | Bin 1638 -> 0 bytes
 .../drawable/ic_menu_bookmark_add.xml         |   9 ++++++
 .../drawable/ic_menu_bookmark_remove.xml      |   9 ++++++
 .../resources/drawable/ic_menu_reader_add.xml |   8 ++---
 .../drawable/ic_menu_reader_remove.xml        |   8 ++---
 .../base/resources/menu/browser_app_menu.xml  |   6 ----
 20 files changed, 46 insertions(+), 24 deletions(-)
 rename mobile/android/base/resources/{drawable-hdpi => drawable-hdpi-v11}/ic_menu_back.png (100%)
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_add.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_remove.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_forward.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_reload.png
 rename mobile/android/base/resources/{drawable-xhdpi => drawable-xhdpi-v11}/ic_menu_back.png (100%)
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_add.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_remove.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_forward.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_reload.png
 create mode 100644 mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml
 create mode 100644 mobile/android/base/resources/drawable/ic_menu_bookmark_remove.xml

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 9bdce98d9506..82057eb09a23 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -3027,7 +3027,6 @@ public class BrowserApp extends GeckoApp
         bookmark.setVisible(!inGuestMode);
         bookmark.setCheckable(true);
         bookmark.setChecked(tab.isBookmark());
-        bookmark.setIcon(resolveBookmarkIconID(tab.isBookmark()));
         bookmark.setTitle(resolveBookmarkTitleID(tab.isBookmark()));
 
         reader.setEnabled(isAboutReader || !AboutPages.isAboutPage(tab.getURL()));
@@ -3035,9 +3034,14 @@ public class BrowserApp extends GeckoApp
         reader.setCheckable(true);
         final boolean isPageInReadingList = tab.isInReadingList();
         reader.setChecked(isPageInReadingList);
-        reader.setIcon(resolveReadingListIconID(isPageInReadingList));
         reader.setTitle(resolveReadingListTitleID(isPageInReadingList));
 
+        if (Versions.feature11Plus) {
+            // We don't use icons on GB builds so not resolving icons might conserve resources.
+            bookmark.setIcon(resolveBookmarkIconID(tab.isBookmark()));
+            reader.setIcon(resolveReadingListIconID(isPageInReadingList));
+        }
+
         back.setEnabled(tab.canDoBack());
         forward.setEnabled(tab.canDoForward());
         desktopMode.setChecked(tab.getDesktopMode());
@@ -3186,6 +3190,7 @@ public class BrowserApp extends GeckoApp
     }
 
     private int resolveBookmarkIconID(final boolean isBookmark) {
+        Assert.isTrue(Versions.feature11Plus, "We don't use menu icons on v11+ so don't set them to conserve resources.");
         if (isBookmark) {
             return R.drawable.ic_menu_bookmark_remove;
         } else {
@@ -3198,6 +3203,7 @@ public class BrowserApp extends GeckoApp
     }
 
     private int resolveReadingListIconID(final boolean isInReadingList) {
+        Assert.isTrue(Versions.feature11Plus, "We don't use menu icons on v11+ so don't set them to conserve resources.");
         return (isInReadingList ? R.drawable.ic_menu_reader_remove : R.drawable.ic_menu_reader_add);
     }
 
@@ -3229,13 +3235,19 @@ public class BrowserApp extends GeckoApp
                 if (item.isChecked()) {
                     Telemetry.sendUIEvent(TelemetryContract.Event.UNSAVE, TelemetryContract.Method.MENU, "bookmark");
                     tab.removeBookmark();
-                    item.setIcon(resolveBookmarkIconID(false));
                     item.setTitle(resolveBookmarkTitleID(false));
+                    if (Versions.feature11Plus) {
+                        // We don't use icons on GB builds so not resolving icons might conserve resources.
+                        item.setIcon(resolveBookmarkIconID(false));
+                    }
                 } else {
                     Telemetry.sendUIEvent(TelemetryContract.Event.SAVE, TelemetryContract.Method.MENU, "bookmark");
                     tab.addBookmark();
-                    item.setIcon(resolveBookmarkIconID(true));
                     item.setTitle(resolveBookmarkTitleID(true));
+                    if (Versions.feature11Plus) {
+                        // We don't use icons on GB builds so not resolving icons might conserve resources.
+                        item.setIcon(resolveBookmarkIconID(true));
+                    }
                 }
             }
             return true;
@@ -3247,13 +3259,19 @@ public class BrowserApp extends GeckoApp
                 if (item.isChecked()) {
                     Telemetry.sendUIEvent(TelemetryContract.Event.UNSAVE, TelemetryContract.Method.MENU, "reading_list");
                     tab.removeFromReadingList();
-                    item.setIcon(resolveReadingListIconID(false));
                     item.setTitle(resolveReadingListTitleID(false));
+                    if (Versions.feature11Plus) {
+                        // We don't use icons on GB builds so not resolving icons might conserve resources.
+                        item.setIcon(resolveReadingListIconID(false));
+                    }
                 } else {
                     Telemetry.sendUIEvent(TelemetryContract.Event.SAVE, TelemetryContract.Method.MENU, "reading_list");
                     tab.addToReadingList();
-                    item.setIcon(resolveReadingListIconID(true));
                     item.setTitle(resolveReadingListTitleID(true));
+                    if (Versions.feature11Plus) {
+                        // We don't use icons on GB builds so not resolving icons might conserve resources.
+                        item.setIcon(resolveReadingListIconID(true));
+                    }
                 }
             }
             return true;
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_back.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-hdpi/ic_menu_back.png
rename to mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_add.png
deleted file mode 100644
index 03a57c998cbf1c1060d09b0094ef3b0e2e574bbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1149
zcmV-@1cLjCP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000C;Nkl<ZcmeI0
z2X5kM1BN+5j=&Le1dfmcO!4+jQ3TUdF`2c%OYg<vcY26G5F|#lL`=5*+kFI%;3GWy
z?WZukC*B~*&pVSglt=GZCmt6U7Z(>77nk>Q*Sj_|MLPG*00Db-Zc21QibjS6kL@XG
zDKai`#6C$Lt5eZWk{T_VnCR2cQDkh;<V56{?6r3!`#Gj1G9?{p;|dMhGEHivueYO+
z66c5pJx;ANIy9&fzRr%cahW=8`uyQLHwQF0B6WQog_IbFH0aVEc|1d}_)Hz+`a06a
zB{`wHG<+VxiP@vh0ZBHlqoYTP&b|=pAo`KCydAmtEC21DJ@1=W=GBGKhFz2sx+D9M
zh>p5KXqOldttE3_o%ek^>wv=A%tT^-yhwnDY@m^2m)Z;cOgd_EM3p!pR=CG9i_BZ|
zEg?5|C34HEl;8pDY@w4NEmVpaY;#Ecg?=U-b>z8LrA&b=X<~#4v3eo5Fbd3GYM!j4
z5hq24JS7aOm~3+(hw6-<8OVNK?C1x6pii3`JD5~ODiq0+A&E|qHTyE>ls}Jgp|L}a
zwvhOd-}np5vRan<$K25Cd4>M0<+qa7$g=<9Hz7CRghRHann8sqmk=_&b-TgtMe6ox
z>o@i9xxYWS^gn!mE5E6Ok(lT*hjiE<c`ido=_8fcp-NTpd;%4-I?>_OYF>6jI8_ET
z*bylbwu2u%CD%<IgB=c}PG9O=TB%Q+Z47ko+aI?|{N_3ts_b8t&P1ulF;xm|5%>tD
zCG#P1Ds0oDdu2M3zS0#+23dkE+uzQ9n9c*Dl&I3+iQSUx@rspdRLFdolGM>DN}ZnF
zmyf@4r4C1wNfUhU!1)!SLji-jQ#uo+14^XW;*t8UN3M<|<SBE^6UTHU`~H2(6iE|$
z=bjWEl_^o?h<yij1TiH~NhC+u_pZl%pRCBoW$`%6V>Llh&ZBo<!F07mQ6xst*@iYp
z2{~1h?>V!>z5*iXIQ%OJ)k=`ZApXh`dCPyx_fnJI6nT-T)A#EwQu2bPo6moCQ@K6<
zk}tS5dQmDNXIhMP(?OlUtVV_`1$6bf%r`tB$OZwv5mJ*aGiH^^5@mDbpwJ_qMw$!>
z9{DCR_XrUoCK8rXUvksDC60;jS~)Vr2;!uWDuhHd{K^-WkReEz7#Z^9NE1b4on=1f
zYjeenlP1X)4*r*D#f*>=(O3~O8)!sHvrU`PcxX2;NTIXEsvJa}loS$eI>qWJLQ*7#
zCZdzVq|Mp*T<qHCGf!0^MVS~8G$O?1V>KT59TQr!BP2xPL`hQR<U(dbUr2SSktZe+
zmygxtspk+uq9jC87&KpznK1O8n>}h2NXUd)89BEL$!S`q&d`4P_JNR6U5?1hVRLZd
z|Ig~uMaZb{y^cz$0bSZuoEx&{%v1l_+;f@tOa1$J&vfJB;^N}s;^OiTmJ#PQ;|~qO
P00000NkvXXu0mjf^N%61

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_bookmark_remove.png
deleted file mode 100644
index 9e23244e2691906078732018e834458aa075bfe5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1710
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

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_forward.png
deleted file mode 100644
index 99138a56b96cc09b5fb50700e2056707f77c3a68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006dNkl<ZcmeI!
z#S+t807r2?V9y452bMesdwhetRB@+**S$?W)6{Txmlg8i_8iC|lexG<W^U#F&kOwG
z8KL&$si~={si~>0{m(hBmpBtv-Clv?^x82!!ddsfpAbIQUJ)eOoLy+t$r0!U()Po9
zDbb>XL7^8&@w++(Z923u$jc|Sr=ERtjJ8#ahIQe*a!HqGT{1~6D+8Szev{<>ilj&v
zOp+loN%(q!bXb5I)XCz*-3z3Kl}?=u+hmh2n50AKq6+C=Af5e4s#77=8>EBOMP(9f
z=><}Uibx}7l2%<=CHL*!eWMFd*&=PUo3w1wJl8z$@8$Leyy<IYM3g8HWg{!?Be^F!
z-Z|d6`MuWQBSxOm$29Wxk~Yrsv6s+q7bA=IRXIZTUAP^KqGZVaL3s*afeK_TlBZ?^
zD7Yv=;h)QsA;ykJHi2?BRHsA9VFM^Wxk7`=AEc2d`&D%gb8OQHJ68Sg^!}SqZa(|n
zE<8K<N+a_{6~U1*eRR@Dk^Za-hvab<k6vf^h?4qPnS(Mp%ZxSbCGoM6T+V#MiJvGj
z!O>)M9PfODh>0{h9Ns9M6BV3-Y|aX{v7e|YPg_1`FQMMx%rQAzFgc<eExPhK`voV9
zA)m7g6J(W<#1UH<5*$%l8b{3i_;XH*hBS^?#HSJK5svsZX=indlt34p9w4>R>GT9g
skWQ_?c=7mx5o&5`YHDg~YHBv_JrMK43B}muKL7v#07*qoM6N<$f;*lZX#fBK

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab.png
deleted file mode 100644
index 496ff3517df516bade75d9229cef5d37a14754db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1186
zcmV;T1YP@yP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000DONkl<ZcmeH}
z1#BBx7e?PQGlOthu*}RL)}mcDl)0iZxmij~A@dj%CnXm>3!!CZhJXKMW?{K!ub!+-
z875Y7&PkIu_q*@)nynlh92^{WD<cq5dk#@zL{WPV2J<jbdkzJbP;ds?26>i{N9{RG
zr^IyB?qn#IW6%RJM%I>U*HTA)k8z4Dlz(xnMjdL`Qs(6zJ1Db2{&iS2xl+56GV>|#
zSugu}d)CW7!#pymJ%=Q%BvHL*z){`@{2|}-zW@3D5<m8}`9}H95J$=CV_o~o_q;#k
zeZYIH+6D=VBz9&XZ(zVtn^cbTdOgd0EBy>%3{#jXPL#DD-#XtqsWMS2vn3gWuCDYx
z<sIxfVY3?)P(qv*;yX3aci!(jeLRQj^|7*AD5EffnS^PinK%hCMiUY0#E7h7x)ztT
zk+5`*&|`U)$!<NC=Wy=>zR!IhDq%S<vwUX;3Vb&nKc3Z|Z#=(vWHpo-glQr{8iO49
zidizG#0=S<S`I_H5;W<thU)v!`<<M$+RrEg-zhtUzH1^#fSF<qAsUEP{@dJ+Ss67h
zJA>3PlNkhLCHLsJ$_@?R8YGdsUyREtgF)7Y2AQ67V)~qh5A6-~p*~D&R6*;chWG6a
z^s+vr>dHV}$`19VG^tHAD9}P4L)P2YATOPTEp|rdDLX_PQzUy#Q)DUatGYkv?&$ug
zebrLAPFwkwIzN)m4>s?VfkMg-k>M#4+B^$+hR%<={L7C~nq^0J^)bJkPlm)MW|)Wh
zWmlhNM=H(oW4ipEA3Z~fe5E5rWVo_J_zKxhTr93EO=!PplURmYvb2??<d#WVS^TsN
zvkC1NEg4Z<DIFxl@a4)5se|HwW{A;Dh&g9$p+Rna@!PC)SQ@ncBKP7J2%ivI+bkVv
z;(w+NQuc_YvNVYk7?M<5BstNL+|nR9QEd@_XgrO&BbHKjiC-(*X=FAY`o^t~T8r@I
z&5~QjsK04T-w)jN9%ks=&>gl(zhuxrgo*UW{j00Sb;-v0oHJ@Aw+u4nT(uFdOI$VX
zU;8tWh~x(8H<Zwe`zS}8C_!d3ioUpU{pIR%*Sp5K9&z36zIxD|W2nb+JcI6bU*)=6
z(s9z&<@(DlyGF?FAW>rEFm6-5BiokK_fd$)2{486_;HIa?EoeawUny?mCP;rrF#ki
z*%{LJPnK+(>Md<2=6_BR5yJ#|QVy@Fd;^#+2B?+9vQ8>e*ZFMed|Y+}3F|CH{^!!k
zs`nVTwXBU3t{5Un9krqiC%;3wYNfS$2+5@@h?T}^SzEYIRfpp6A~C|fFh&c-;i`I+
zCbX_k5GG{9FbP`M&zqsD%fg3B|K@2VxRW-Jqx5g7pQ=6!&n~Byu3kWaEE$p{#566G
zSdJ+!MKV&A&$Ntm6{NCswV7RbwyHMPYtHOv)|y#!zF9V3GT)Hjv&|djwIiQ=rIXFO
zBx^U{mZU5lS-I*bnS+CagM)*EgM)*EgTr3Re}445S9ii^IsgCw07*qoM6N<$f;?|H
AkpKVy

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab.png
deleted file mode 100644
index d7c6dfa117f8d36e91324afad86e529ca1308932..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 480
zcmV<60U!Q}P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0004}Nkl<ZcmeI!
zwU-n@6i49+2}#hDzYKTDCd92+sgbpo)9db%pb>5{Ar|5gU)<iTSI>FK``xgryT7mt
zHk-|6v)OD*ZQq)GYrpp=VEXp)OON(#Q3dTkafEZU()Oh?M>ssC3Oez;kpYIjH9#xw
zgDR+%e#V*n(FhT$pp0=*r!J_|KuauROq6MZMn%e?lo3&?4H^<DgOVChq6>-{5XHKn
zs0I{igZf3vpd!7ZVtql|)^F?B_GBCLw~zTi``ETnPd>eELl9{Djhz%ZjpM>RdD0qC
zil6tc<1|Hfvi(L7=opSRI*8^ip_49ACkfHKb<l?67(t*WQt{D{I!S2?169cA%(0A0
zI4Iu&L7p_{d>E)oMv`M0)i6-^-BCJ;bE=aOx*rCCdN*GhxccrY^Eb-?k!XNft}fKO
zOJlv83-w$t9im<enk&;LD(iw8Ye0><AV;gn>4MHt6`eDX098clpt49AbQ&)@{ilNr
z)Fe^|`9BNfo>hP2RB$g<LDilVPvf^d3Dr?mQ19l+YjgZ;@<GV|j?HGX*=#nO!af3g
Wd6N?jW`XGd0000<MNUMnLSTYbMB9h}

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_reload.png
deleted file mode 100644
index 24026f9c070ad71f4686629cb5af99d78ebb6528..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1146
zcmV-=1cm#FP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000C*Nkl<ZcmeFe
zF#!Mo00A(ywU@!aEjIuFfUezg0B$@B;Bd~y;B4ErIXH7|Cv~<d=BnAYnZ{*owYj=o
z^e)ZX=<saY{_f42bDCrRxBPwMdH9~+wDN1WA)Wa(I;u^o|09}xr=6X1#f<AU7Z)9!
zS*HpsmL`Qo)DNg#>gRGPKr1L97tM$2K~0|a_;j5X{In`3q&q@WoBNTD8VuNIp;gj^
znL5fTK+~Obh3cnh>#JxbCU7VtRJMmEui(=PjI`p$PlzxPNthsB99XHLn7pW1LZMSZ
z3sDlpl@TgBIzLs80S5sh#OWaM8#;&+C5Q(bRTRFR7p<U~h%6OTV#$imD}1{~?uRJt
zbY!5N7$KaP<t&DODjChXkkBdqupSp-;<QT=^f1J7)(BQI%mAIVOX5WE<NZz92rW%n
z-pIOF^|*-;BQ8j=SV(Moc}v^KtdaXh?i?AnWx?jPYZ#)7xFjZt|3o;uLS=iDEUCp!
z_@_?#7-s$Ord#5>{l47lb65L@NDxaSlwG0XX;s(>5f#K3VCm;;rU;o)6OKnoCrD%V
zglZ3}eAh~lh@_9?JITv3m94I};3twsAe%zv^Xu^tA}r`+@t2u(3d<{KL6l6xpFN?n
zJ*r-6B1lLOWq{s!nM&pr>M-F&lug5zy|=9VT0L%pl1@4|X4*TsnqmyN2@o6wZ}x<$
ztIhcE3j!nvJ(A(EovB5SQ<fYJH>PX}El4%vlY|L=6x(Oi*_o`R9tU208E|D!NdHb7
zUP%N;&uAsI$Jc!4q>KJPp$DfiOaC4tPCODH&9$Rn3%w1iTi5?7%Wa7>vh-w_apIEL
zX;7=Sc8ZR+;QWc^tu7>&!-^A!#71?sYU{`PksG_jLRDO~^<!D(rA=a?^4+pMwz`nn
z=%z)|NCky=Y<;1-owU*{XrhLKr?$FK*&c20xM`9Y(4u}|t1C6v256#DV5I`hdlOGl
z{YAtBtYq4b^nKyNCa_{a$E;^3AOGibI?grjNl`|*cuGSwV-=XGL(BBnXI!7D?4-jd
z_s?PuQ@$8qs@Yc|q1Zm5kpNaK0u!}pneqKNSNhUv_8mKK%6qvyK@~b7HSyW;N}bB^
z+3}COm?cJPDMiiX@5c;{DI9;tw6iCkGUlo=6UVtGd^ig&HRv%=C$zNWl6SL0N*y<M
ze(AxCNnoH}&Ot7-n9KyhWTvA=D<o=Zz=#PW&G>OGP$`$ryE?!0VZkUcpr@89Ay7`K
zq?{^h<=hyhkdqF&suezOgBK6J9Hj;0Pf`u&si#h&N6JWS1nB)@V46z#^c*tO(oc{^
z3>mQCp^N15fpe9!NSmi*VlfF^SZVkTCfbNHz|)(P4=cP>=@~jcrAsbPe!Z9hdIbF}
zW{A}DDf95Ps;!sUKC917-J2Sdnx1@k_}bw^w~EBB?8>g}%C79nkH?l^ZVo~2hyVZp
M07*qoM6N<$g3&uFH~;_u

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png
rename to mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_add.png
deleted file mode 100644
index 042dee803279815ebc8e93a7d849ec32d1a5e98a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1753
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

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_bookmark_remove.png
deleted file mode 100644
index 50d992e7395a89043752f486305bfc5c95d58f96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2176
zcmX9<3p~?ZA76%)$2FqfdeX&{Cwi<x>AKwSG?zr!T0CL3E%)3PxedcGWW(6zGUh&J
zhUpb@c}dDOsgM|Zq#OO8e{a9f=bZC9=l4D5dw$<@KIbGk*qO`i-oG0Hfyh}}m>|Fw
z`LoDC!FtRr0Srix9c-LT!ERVsSX^A3udgqk&re85AP@)*4Go~r<#NHnU)Ivn!sGG6
z!^7L#+uPdOIy*a~qoYA5Ha51as|&<{fY8uT5CGN>9z0;NSV2KS0)c=`CW8QwA|xav
zARqvb$45j&fMC!ExvHwF3JMCq>G$s4%gV|EyQD~05cvy_#bUwrqyBHLt*uE(NiRo*
zC7J$BO-%*qxJm{&EiH{iB4uP`P^nZfN+c55Y<6yLF31i}EG#U1{P=NcX=zSQPG)9i
zadB~adU{Pw4THe|xl&V8tE;QCv$M;~%gf5jz-^S2l+b9jyu3UnlUZ9^TUl8dA0JPl
zQ0nXJ>2!KZN(#tZQBeVIGCx0`!{J0mMivznB_<|<iTu(K%mNfmC=`M@KIvpPH#avn
zHv0Mb1qTPC(dd-8`^%Gszy@>qby*jm$xgcls<GT;<L~dEn-K%bwKh%L9FG9H%t7(L
zOvMch4D|N)f*J+}27)pI;?kuSXF3@Jicp$^?PlF=E(xkAjQRZ3^Hm*kuFd!3WS)S9
zU!Jev6y9B!sP6A=+MJ`5Wcq#LSu9MjNpYCXRx>{zPaMXZNeOGGqVfn%k3w!NH{0bu
zbn)@=8LvWY&SuYzGI~17XI``dD+R!6Auyi^Oh*8dVZeYVFoXiSZGiWwz*-ToUIILG
z2ZqtWhz~Fk1dL&Tm-hjo74Rk=81)7EU4eHgz#<7)$^v>_fdAS7PaS~|IlxB>@R|V3
zL<8ekpyygHnYj3>xUU93H_iQD1J={i6Fk$+=b<4wJG;Sqc_k2G=LmrbhG+t~B7DdJ
z7DH1M2sC0eL^N8>5IjZ^2ZxJh1+*BrqDX|S!HH<_n4xWrAqSCYc1VNvV_Wd!2X#Zb
z4g!(7X=!rRDb#ai+}ZJ{uS(2Z2aI^SkHzCvS@A-qraf>Whrmnc1(xq;zU%XMG@Y<9
zGQQU&o(c@H!_RzU4VvBtt{DEb$);S)Y|az-jQr!Ckhk8tq;#BteD9E3k>Y|=uxf&u
zk2Y+gtbTIk{P-f~AOulqR7|pxQ}tPfm{`DXFUiEa(d{&c_cg}9GK9l5cXQ4DUQj&}
zc;tw-F5>bMgco`Fkk+}UTRI0i_Grk24~Z@X6J$c$jz-1lx6w2bNB)spu<jfiO5ado
zgsY~(HJrj2b2i>uiZ}{?)Z74OY-e~t-pkb3*f?Hc>RSH3qv0`>Cn6jxBK7-c5q6{e
zfV@ESe2F<_$K+O2wDS`lA^8Lj`_No0<F5RhH%!qvRV1^&Qs!aoEoFBzEf{L6o6VU(
z!noR=O3vKQto<|R@mq1I8mfK;yYwjWj6w2l?y}e3F&<RK8@+}zx140%&^U?@3hJFX
zcTlJ#mvrBtU|@P95|Q<vive2YSJ%`J&blKml|Fm)3F_j0L$72_eaxUh=mB^j_>-vm
z^3>l=CB50u)5~XXE4of2RyVrt&v+Z1RI2Z}<COBz*6WjhU8SiRz2`t}(I0BM3H(8E
z&e#%EkI{UZWr})#4xM>*Vfj_ShyEz$=Ej%6N9~3^d8&KKwI5EMkAxVh{;rT~qU3zZ
zn-_BF^Ova_tb$YY>UyyUum3@XOtQ5&R7Hz?nUnU~M4HF>Hay>7sMc<=Vzl6W3VjxL
z<d(;`4maBDsP*<DYT@Da(eUA~YZ()x{UUd5>l)T`<lZ9Pl`Xw97XYIH31i<3ojp?7
zWC>)$%7y5s-Gjj==@3?*#6A-Ku+d16#}&r7vw2p=v(G6~w3EuUFfq<!+<z%>EdCu)
zQ@QqQ#}A@vi(!hCcLr{HwuX64&CK=rt@W2Fw~f~c)5H?uuD_z!g~u=4lrK<M(Vy%|
z-G@Lv!_*cL5B>OJDc^G#4`4XaEGa1=$EEH4Yx{>6T<06>exs{@i*is`OXgH1b^B3)
zJFuPpu#xV%4AL5q;oxw?hM|!jbaP9mG3B88A-z1E6L`Uf(bmVE<&RUXXK6Z%!^q)^
z9(w_;&({JgCw;B(?RF8T7v1RQ@ojd-=A8mx*5*<{M^vwYv<D<ioa$uvA-*_>j!~y(
z%kKEP{uyETmzr3tFWmK3c+9eHZJ~U-i?Fm7WpErxUC2XwF@uRxj>isX-J?3v$Co|K
z1-2_JSsVSqun}m$t?%%di{bzQ6uO#DLbmD}m_I;XZnDR{DJcEk475cGL`x<jl>*&M
zFtt%g9~7IkifJEL#<nzn9ds{&TA_#o*}qeCBtut@^W8)*n&Qx|I#Y=7X6G%7e%aXG
z5vcwA{g$b*8M%g;ij#kayn#u~4~jD<+}YD`p6s)AX6ep5GLltiTY0+rvdercNlB%$
z>lS)mA6DB@QURJL4N2xg8G;tp^KSc#z4k~&Vj@z;x_h!(--}<aLRAh!KxOw>sXwA$
zuf9G$OmX4n?zFvX$UV`h?%^1@ZKWcuEL$d>V~FaoPFT{K;ZZe{|K7U?gOx}p4Dn&F
zZ~mdr(PKz9sK1ZzP(3A;%(Tt4&38EfJB);cox<s8G&zag_p3@MO72q2bd!1k)u`=*
z%Tr7=1x#(agR*`0U<3mTD=#9yDK1^KN{UrQiDEuEdP8jsU(wbcUAK_cVdB|vbg<g7
zaRmz%?!bOFgqdqC`_>eN-zL}oxqxOS?mBnkQwm4jd6RwUVzG%@|1mcXs|u6EjT-LG
ltgADXy)DcJKT**BQBc}meY->3`sb4ku{5<asWw6q{sp61W)J`X

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_forward.png
deleted file mode 100644
index 51fea1bc49250dbc4d670f0a2f124cdb771286f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 790
zcmV+x1L^#UP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0008rNkl<ZcmeI0
z1FURU7)EO|Y}lA()Hr2~7pu{;t(kjk_l(WMv8T3;s0fQVjrHQps`cl-U~n=!`M(u&
zt?V8B7p&QII-O3Z)9G|NUF6E6I}Sun-f5_Q^rlnaM%d)^?Cc&R^*6q^s9=-fQAC0%
z`W`*{v?=nqNH9V_V8nze6S`(4R4;nuQwyIVV<vwvrbEG;kCeDIh4+uXOfVwAXTpf_
z{}|CGZ$`qA3txHv9j1)UO?dZ)kH7pqVI&yR`Xk}=ZcPXy;lr=qV#-i3phb>{%}JOr
z5cFx1)r3$JM)U<e8f4hy#7?6V(xxQ5|J9oe=?S_7q}Z4llQ5tw=-`vogb)*6qfbZB
z#xp13-LGGxM_bUsC1FxRmzJQ3L!1alcW6R*2~9x*8_SFY`^MhaJsJ`M>R6nftuP^a
z-GRui@*?ah9V$Ok&h#9DE%2!=IYH<j`|&stHW%b6GS~#+C!F2$I0>=~lc$P{e;z!l
zJiD5NC!WqwrH;KY4ldq#ajC2(!Fsxk8ww8PKN5~_TXH}ZH`IhjK3#G^1t&CY>R4Yd
z{R`Ql(PV@dUHS{uL!!ZpyxbgIywrgFgFYU$5D0jY*Mi0M#hRDD_TC4)wJ>k;B3<l|
z^u^))lWkw@UYr;9_&-<K8lS1qU&G_?^W_v}DqG;0pntOTFeyruk+@9OU;j|~^vt4Q
zs{WqRah@Vek&?h+%*)NS*FVZrWGGM+*e2-jF8;2cCQm_7XB2|I>OW439C<;Fp(*-F
zvg8Cc1}oQB{X;xTf(%(f)dc+=h2Qn#q{#>>^qI6*t*`nIW04{)DAO}R|KK0`Nm7Cm
zUDaRlcE$hHPmmN8>8!v0!JCh=X_CI&iF+Q#B2Ge3SYLg4#m@g?lQc<RZt%e1oK1rG
zKjdjkeUlQTzF`Sc-=KsS&b0{`N_}(o(p~RQ-~Z~ZjkVR+>2x}sPN&o9bUK~xR}eyT
U6NA)&P5=M^07*qoM6N<$f`E;KzW@LL

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab.png
deleted file mode 100644
index 0ca97ab7ed5152eb9c17e0835816000f8e3a5da1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1599
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

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab.png
deleted file mode 100644
index 3b2622ec767c66787b040cdf3ae396f2e10fd55e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0006rNkl<ZcmeI0
zMRMLi5Jt83C31>fA^#?L1DDzICLF`Y%$D^tYh-3-UgsELW?I=_nB-2Gq)ByEzjuJ?
zSJSID1V0f3K@bE%5ClOGgtF7-Z4<w(dSl)+_+Xx@dUFL9l0S^0;cLbvHUZc2)leA0
z=r0G+g1Q|x0UeJLn8xg1D%fw?1f+IHG3#*>Ij{*(nBEsKgFZe1E@lW>1xypV5}*x*
zDMBRy8UrQ?83j0)Aao=^8+nWq=J^EVFiM!?6ObhXvJ#+;3`PhuoC1ak83m*<NSNjm
zP)!C@9~e+nP*f1;rJ-o7=x)(VkDrS0w<i7-V4~<?KNW2ioiY5UsIYXebgvo>X#UF<
zbfW7oZR9aPn1_w71MEZtzP?jb=zGAGd)0^_i4@WvGahqr(MRYahs=Sd5JNSt-19x4
z{cQpc+<o@>tP2M*w88fP`>g|4lMZbE1EQ}LTy4gJ2ymdZ84Y5E@^G{n2_hheye6F>
zRw(nR4>?T^BJ;@ifH89xqfp2OtimXkFlHM5vl80b+WEMHgIvNWIoj93b`JLA&i3j#
z<Nq>@4B;>gE<}+gjPePvkRr7B1au)u*d+nl=tP3BlTSc9VubAyaCjsjO2{an4H3dN
z3D8ChY{C`^kbuL|j9$WKPCvjrpba)Gubft><53ir#|YZrvI($OlIZc6gtfvZAQe(b
zq4(GD7Lst03K@JDGnbw&;SZnsdngeEK@bE%5ClOG1mQD{)MR$F3QPF_0000<MNUMn
GLSTYgy903m

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_reload.png
deleted file mode 100644
index 712916f45d07295d1a55a07095ebdc3df9348bd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1638
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

diff --git a/mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml b/mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml
new file mode 100644
index 000000000000..2afadaf5e23b
--- /dev/null
+++ b/mobile/android/base/resources/drawable/ic_menu_bookmark_add.xml
@@ -0,0 +1,9 @@
+<?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. -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
diff --git a/mobile/android/base/resources/drawable/ic_menu_bookmark_remove.xml b/mobile/android/base/resources/drawable/ic_menu_bookmark_remove.xml
new file mode 100644
index 000000000000..2afadaf5e23b
--- /dev/null
+++ b/mobile/android/base/resources/drawable/ic_menu_bookmark_remove.xml
@@ -0,0 +1,9 @@
+<?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. -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
diff --git a/mobile/android/base/resources/drawable/ic_menu_reader_add.xml b/mobile/android/base/resources/drawable/ic_menu_reader_add.xml
index 9832a2203964..d3e7c7917252 100644
--- a/mobile/android/base/resources/drawable/ic_menu_reader_add.xml
+++ b/mobile/android/base/resources/drawable/ic_menu_reader_add.xml
@@ -3,9 +3,5 @@
    - 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/. -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-     <solid android:color="@android:color/transparent"/>
-
-</shape>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
diff --git a/mobile/android/base/resources/drawable/ic_menu_reader_remove.xml b/mobile/android/base/resources/drawable/ic_menu_reader_remove.xml
index 9832a2203964..d3e7c7917252 100644
--- a/mobile/android/base/resources/drawable/ic_menu_reader_remove.xml
+++ b/mobile/android/base/resources/drawable/ic_menu_reader_remove.xml
@@ -3,9 +3,5 @@
    - 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/. -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-     <solid android:color="@android:color/transparent"/>
-
-</shape>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
diff --git a/mobile/android/base/resources/menu/browser_app_menu.xml b/mobile/android/base/resources/menu/browser_app_menu.xml
index b78b59d2a245..85fa1ec3e3fb 100644
--- a/mobile/android/base/resources/menu/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu/browser_app_menu.xml
@@ -6,30 +6,24 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
           android:title="@string/reload"/>
 
     <!-- We keep the reference so calls to findView don't fail. Hide
          to avoid taking up real estate on the users' screen. -->
     <item android:id="@+id/back"
-          android:icon="@drawable/ic_menu_back"
           android:title="@string/back"
           android:visible="false"/>
 
     <item android:id="@+id/forward"
-          android:icon="@drawable/ic_menu_forward"
           android:title="@string/forward"/>
 
     <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
           android:title="@string/bookmark"/>
 
     <item android:id="@+id/new_tab"
-          android:icon="@drawable/ic_menu_new_tab"
           android:title="@string/new_tab"/>
 
     <item android:id="@+id/new_private_tab"
-          android:icon="@drawable/ic_menu_new_private_tab"
           android:title="@string/new_private_tab"/>
 
     <item android:id="@+id/share"