From 15572f0ac054651d7a7368099d7905bd84adde82 Mon Sep 17 00:00:00 2001
From: Amin Bandali <me@aminb.org>
Date: Mon, 28 Dec 2015 22:05:54 -0500
Subject: [PATCH] Use new material search icon with material theme

---
 res/drawable-hdpi/ic_action_search.png            | Bin 0 -> 396 bytes
 res/drawable-mdpi/ic_action_search.png            | Bin 0 -> 247 bytes
 res/drawable-xhdpi/ic_action_search.png           | Bin 0 -> 465 bytes
 res/drawable-xxhdpi/ic_action_search.png          | Bin 0 -> 728 bytes
 res/drawable-xxxhdpi/ic_action_search.png         | Bin 0 -> 915 bytes
 .../android/vanilla/LibraryActivity.java          |   9 ++++++++-
 6 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 res/drawable-hdpi/ic_action_search.png
 create mode 100644 res/drawable-mdpi/ic_action_search.png
 create mode 100644 res/drawable-xhdpi/ic_action_search.png
 create mode 100644 res/drawable-xxhdpi/ic_action_search.png
 create mode 100644 res/drawable-xxxhdpi/ic_action_search.png

diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbfbc96cbce0dc0bf2a0b5ac4fa924dab5e34919
GIT binary patch
literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003~Nkl<ZcmeIx
zp-L=K90u^CEX=08H;Wi77N0<5i_NaDAch5##f=MggJ7EI3tV-}Wqk+1vP}>MlVO6$
z;_nvIa)$r8oBh5veEc|b;H00d8XJzB8#}e9C&kTuJTUVGfHxC^|AqQ$xx5-GhxGjg
zEIhh0QF{S=I4p;1z^yImyK9a$ptVy59RMztM>fsDtPGlg+w5@HC)kgn4PRK;>X_bu
z>liu$k6lAU@DxMm;HncEfHsE4VA2Woz#@iDLEQ;$gC>Udz>Bqx=?R#|P|q7U?)b51
zFp8mM0vel{;U#$YTMYT-70m4}o#qm7R{GY4KES6NLjyhAPCNtV)=Qz}P%ED~n5xR4
zWXH^M-kn(oJmjgYZr`;ht%b(a==+MNfO}N{1?^|3m7t{Z0Ju|yP(a=1sbqEPk1B)$
q>JBiDp_nQ^Q9zA@J6g3rP~3lFwlD09o&!k$0000<MNUMnLSTZ?s<9;i

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..faefc59c8e574774fda7a43bcb2214bd109eaa1c
GIT binary patch
literal 247
zcmV<T00{qyP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002KNkl<ZI1$ak
zJBq?!7y!Tz%{l&{XIR-rQ1DiY-Xn#*_&Ac$Qd1i%WwsLn$&%8Ui0@|Mr1Dldn#ccS
zwwelAbhE|7QZkTRsZm513q1V9hlv`qXy=4wG+5&h?Nmt7V1!$=^Tr?=4DpI~D&)~%
zjC-_m#3~wWu#a};s7>O-uP3I_MS<Gd$k5ov6T9dpQ)t@ZDvxev4sKrV_NEc8xX7a~
xxeH1u`jRVAO3{~GiL(@aNlIra`je#iUVs1K*Gcx9Q#Swr002ovPDHLkV1j_mZi4^-

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfc3e39394246b221f7d4617aa5600a6406aa7c7
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004)Nkl<ZSPAXH
zPfA-+7>D8CL_;(V?AVEarj0ldk$~bl6y3&Eqek6=6UA+aBGp8+4bCOt0yJyz3VGY|
z^>9EE59hXLP{{L0Lqkciz%ebl<m7Z|a>Ts;71sDpKM$<xZ!yL>pE;wf;`qWNA#EmA
z3}Zav^tfQ1X+{`jh7B(9+LToU=QvL+>I0VO;G8NRYdGH+S07Zk#aU4-eqf#$*8o)L
zVD1%%1x$}ceS&42s$y`AxljOCm_x;&g;`eso0uELpo^JS0JE4E#URIwD1Z{?O)<zZ
zqY9vec~=a&m>C5yhj~>DnwSj*u!U(V21l4n1#pdNC<gO5OZo&goUe+*1Exbo12Dle
z=1#F##kr-TKA50|=}}WW&Tu*`>jP>$<D94n%CzyW*kqOxCFa=T8ZT!`#V|>mkQ{TM
zA}DjpU_DNl!r50btZ+|1chvL?-kyr0${{zr@Wwl@G-*)PA2jglN`V8sx>8^tZ&xX>
zhqt2?sN-!b1?qU2QeYP^Qwr?hWJ-f=e#?{&8JUKL{zpFn4bJ?-H56sJ00000NkvXX
Hu0mjfDd@)s

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..abbb9895108b56aedde011bdde5eb8ddaff78838
GIT binary patch
literal 728
zcmV;}0w?{6P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007?Nkl<ZXx{CZ
z%}N_l7>18zk+dXf)UDAjLvsN|p{t6$05L%?Ktw?Z^gaZCQV^>Zx>oT5B!UZD>LPSm
z|L~VCszm}4VSKu%ZO@sc>73z9GKG1U!+E|uoS*N^M5!=g!h{LqKXj94ff8p_aHw!f
ziFtB#wL|6=o7_=9cWf}!N|_gY;@|neKr3V(v542)QzX`0ojyKemomN0(|N`@_Bkcf
ztl6p6`NkqSGQ^1xCqtekuIebI<#is{EY>;WMC*)<GQma7!b$I?nyvhnM1#>uR$b$Z
z(g)o<J<}eT0`~^fFDYd9ooSC$!Ju{}yRxxZ7NogwgHl49##T;PkWaYO*fklQZsX1x
zx1=XEwo0djP~PY}QA;|;wZ;!i2rXy@7k%){8b2o?RMHCOeDI?hza=4brWN#YE0NXs
z6A7V;Rxs{^PiXv&gpi{ZjQHRq8t(*QhLRe8D<O0mv^}Jsvb+y|OyjpDgyyw^OFsA&
zjh~ee%4r3!e01vX8b2Z-)Mead6PEOpahIi(MA*=ZUXZjPQ+(CfbtMyqjJKM17UX+_
ze5s_uN274TBlX&#c9dKgaJ?TFJn86+!*eAW-nhOZRvYalQm(~<86_KHlwCh@$z;8+
zEn-X=TNz-_wq1Bp>NPHrpSfn4QL-e6kR;0(D@Nb>GoKwwK4j`B+2oi$`B^GkO6(b*
zLPzpSF^b0NX%vSUqI4L~4#ky}qMuz4Iy=7(y6gF2Q~ohxkTt4*QK_=7cV&)SqNEg^
z3^T_TC*0t0%L&`eGUC2MdD=21&+2^~xs(oqsFZHE(qX9Np|QG^_S>&?P@~inD!G)>
z|AW$(_ABiNO30<uejTNhqUS*=7&^a|f}``G6eOK6VZww7W1Sy&G>vw6u_#jj0000<
KMNUMnLSTZewp6SD

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_action_search.png b/res/drawable-xxxhdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd5adfc7f990333743a5f3b34f09098c1377a4a4
GIT binary patch
literal 915
zcmV;E18n?>P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000A8Nkl<ZcmeIf
z&1+Ow0LI}rn@qY5*-OFc3@&uygrFVW*Hqkf5p*LhL)=fkzq%|HB8o9)ujpSOm0%EC
zC0L8L+cu-33pFHy;6%e6er=%z&&e6h%)RGkF5KslQmIrbl}e>jEh5hl3oKJ*oh`Ol
zr^+oB7$T?k#zD^UoR4|N90j!>Iyk`!J9UraYA5vbfM(sNPwjv%=Bd+)Iv42D?jpzU
zgz<>1b`M8+O;{V0v^)5kO`=faE5(naY|_YI%ri)VZaV3tn*xJeVwFZ}e5rVm<25b;
zS2&~wILuW7TsFumK77U>xZGf`K7kxJad}8aabceA-f~(y#CO!#?!4kbKXq&`=v5Oa
z@)BE}gYu6K9$<SxR!t(uD{L$Bj}zG5(yJEG$0oJ``Nj&i(`pfAY<J}sz1VIj1eUPv
zmrtC-6tGtzkSD-&RzC3@(-nopHB3+C4|!~d6cQzDS^2^crau({s+h|1g#}FWiU5}}
zU6d~@V;WQhIEiUVzEH(fPy{GqT9q%XW9n7}=)trmU)aLbsR)q4^j^NOg{e~!AcHB8
zFRWwgRs`t5^hUl=#Z*uPC}OJ07j9u1R0KGM>9%}f0n;T#fJID;@`WKxs|t+{9%CxY
z7joDRD<qC!%gZ00VY;f2xQ^+Gd}0n$z!wUEebh0{$tMcfeo_c5V>=+fxQFdqwTLs=
z?#MTeW2;eA3+U$^wqx>-``BKRQ<KQEhV72xKp%B%ujo?~=w}UEK(FG#1-9FytR3PE
z@7V4K#f2^&;j%<tpTItraru=_#fK~#xCC6Iqy{*`b?UgRvq$lwM2$wOT;?Q2ddQHW
zha#s~<S~r}e51H=j2h9KReUJ1L0B6Em}V3ovOFY=-}szCY%_`v8O~Fu6#+kz(LdO3
zT5+Pt3eEb3qW*)+wBp48ciE|*8PErCn^N4^&sm=GF;AG|fGm8E+oW~_S;|~wiB;Bk
zPrw_h+-8w7c{RW+Zj(w1W^tQPQZR$tgpz`3+{Tp@Oyf4Dq+klSF(n04xQ!|)n8a;V
zNx=keBT5P;a2r-qFpk@>l7eyEDoP5*aH}XO7{#Tc<X{wAMajYlAF3#M7~y{vB@@H^
ptD@whLPe=mDwRs5QmIs%`x_$3LF2hcTNnTU002ovPDHLkV1mCDpauW{

literal 0
HcmV?d00001

diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
index c3f55f5c..eb685285 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
@@ -814,7 +814,14 @@ public class LibraryActivity
 		// Call super after adding the now-playing view as this should be the first item
 		super.onCreateOptionsMenu(menu);
 
-		mSearchMenuItem = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_menu_search);
+		// Check if we're running on Android 5.0 or higher
+		if (ThemeHelper.usesHoloTheme()) {
+				// Keep using the old icon
+				mSearchMenuItem = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_menu_search);
+		} else {
+				// Use the new material search icon
+				mSearchMenuItem = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_action_search);
+		}
 		mSearchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW | MenuItem.SHOW_AS_ACTION_ALWAYS);
 		SearchView mSearchView = new SearchView(getActionBar().getThemedContext());
 		mSearchView.setOnQueryTextListener(this);