From 5a92b2356f1c5f79207c4e9bd47d7b0b5bcf6f78 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 13 May 2015 13:06:11 -0700 Subject: [PATCH] Reodering some drawables > quantum_panel_shape is xml rectangle with no margin > quantum_panel_bitmap is 9-patch drawable with inbuild shadow and margin > quantum_panel uses xml-shape for lollipop and 9-patch image for lower devices. It includes margin. For shadow, use elevation on lollipop > All drawables have _dark variant > Using #f5f5f5 for panel background, instead of #ffffff Change-Id: Ia7c6cea6d514ee3774fcf5fef6139650bdd53208 --- res/drawable-hdpi/quantum_panel.9.png | Bin 744 -> 0 bytes res/drawable-hdpi/quantum_panel_bitmap.9.png | Bin 0 -> 608 bytes res/drawable-hdpi/quantum_panel_dark.9.png | Bin 646 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 0 -> 629 bytes res/drawable-mdpi/quantum_panel.9.png | Bin 476 -> 0 bytes res/drawable-mdpi/quantum_panel_bitmap.9.png | Bin 0 -> 436 bytes res/drawable-mdpi/quantum_panel_dark.9.png | Bin 449 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 0 -> 445 bytes res/drawable-v21/quantum_panel.xml | 22 ++++++++++++++++++ res/drawable-v21/quantum_panel_dark.xml | 22 ++++++++++++++++++ res/drawable-xhdpi/quantum_panel.9.png | Bin 928 -> 0 bytes res/drawable-xhdpi/quantum_panel_bitmap.9.png | Bin 0 -> 843 bytes res/drawable-xhdpi/quantum_panel_dark.9.png | Bin 894 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 0 -> 842 bytes res/drawable-xxhdpi/quantum_panel.9.png | Bin 1439 -> 0 bytes .../quantum_panel_bitmap.9.png | Bin 0 -> 1323 bytes res/drawable-xxhdpi/quantum_panel_dark.9.png | Bin 1366 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 0 -> 1332 bytes .../quantum_panel_bitmap.9.png | Bin 0 -> 2546 bytes .../quantum_panel_dark_bitmap.9.png | Bin 0 -> 2531 bytes res/drawable/apps_list_search_bg.xml | 2 +- res/drawable/apps_search_bg.xml | 2 +- res/drawable/quantum_panel.xml | 18 ++++++++++++++ res/drawable/quantum_panel_dark.xml | 18 ++++++++++++++ ...ps_list_bg.xml => quantum_panel_shape.xml} | 2 +- ...al_bg.xml => quantum_panel_shape_dark.xml} | 5 ++-- res/layout/user_folder.xml | 2 +- res/layout/widgets_view.xml | 8 ++++--- res/values/colors.xml | 5 +++- res/values/dimens.xml | 4 +++- .../android/launcher3/AppsContainerView.java | 6 +++-- src/com/android/launcher3/Folder.java | 10 -------- 32 files changed, 103 insertions(+), 23 deletions(-) delete mode 100644 res/drawable-hdpi/quantum_panel.9.png create mode 100644 res/drawable-hdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-hdpi/quantum_panel_dark.9.png create mode 100644 res/drawable-hdpi/quantum_panel_dark_bitmap.9.png delete mode 100644 res/drawable-mdpi/quantum_panel.9.png create mode 100644 res/drawable-mdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-mdpi/quantum_panel_dark.9.png create mode 100644 res/drawable-mdpi/quantum_panel_dark_bitmap.9.png create mode 100644 res/drawable-v21/quantum_panel.xml create mode 100644 res/drawable-v21/quantum_panel_dark.xml delete mode 100644 res/drawable-xhdpi/quantum_panel.9.png create mode 100644 res/drawable-xhdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-xhdpi/quantum_panel_dark.9.png create mode 100644 res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png delete mode 100644 res/drawable-xxhdpi/quantum_panel.9.png create mode 100644 res/drawable-xxhdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-xxhdpi/quantum_panel_dark.9.png create mode 100644 res/drawable-xxhdpi/quantum_panel_dark_bitmap.9.png create mode 100644 res/drawable-xxxhdpi/quantum_panel_bitmap.9.png create mode 100644 res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png create mode 100644 res/drawable/quantum_panel.xml create mode 100644 res/drawable/quantum_panel_dark.xml rename res/drawable/{apps_list_bg.xml => quantum_panel_shape.xml} (93%) rename res/drawable/{apps_reveal_bg.xml => quantum_panel_shape_dark.xml} (87%) diff --git a/res/drawable-hdpi/quantum_panel.9.png b/res/drawable-hdpi/quantum_panel.9.png deleted file mode 100644 index b4ac9c0a064c602dedf25a76f2fa7758eb9a8cbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmVP)gf&z&bKzRg;AklE;T}yEtaxNT*AlthX_9{_?xE;rP zR-*kR%TBSG`FGZ{_KcM=2Bj1YVs;qYm?OsQ;zl442y9U|J2jeK9TBI$ZVe-9<6!H$ zNepX2+h->vPFWEV(4m}|s5*S1t0M=B>UvZ3f00J61N4BS`F#H3`1ts#F-8H{a}y|~ zj6E-x%kQJn=o7F4GD@LNxQeq8>j6h;n!fAz`>%vP*CtKVkAuPBZS~Ve^WNx5BBy}P zY&JWM<9J*Y1zPJGuF8m_h&Ya4&StaI@p$|N!L1|}*BcIpXU3RLo;$COozPm-?RLAv z;qVOjO1V6pkR*c$=w(^fd+3K!V+>iA^(b!(XP+hF6wt}@JZeK+p6518J1K;eG(|Q%eXPcmLK;bjhw!^y1EpOX@u+R>q~?a>-t8ZD67+tfhRXNHy@HDc`o#?Hn+F8 zpHEIsUIPo@jo~dAkOhQq&#r1NaI2#&LN{8X=}Kv|?S>w&HwsR;{>Stow7$2}LTd0RB*l z(X6|xzOY@@Rb|&MODCi=Zd=EjZDZd(@y)iesOr4S*9^WyZDXj>CkO-rfj}Uz$EZX8 aI{hy?yX2Z#C>`|x00001PrM5GiEO*x99*sj;>5A*r_Eij^LQrIA^cgqB_ zH=E7oQ=aGVMC9Dg9mE)ewU*s(_hmdDzX$#R1;LVtErSfO*4kSUp)AYfvL0*gEmc5_Wq~gYK>j(hFh$&7RWCt3VT_I$hLLXFN0iFxsq_sgpqhkc{*GJzbQpW$@oI$fjbDO~oLaia|CNgKR1W*;MpSwl^VJ?>gHX z+GNA5>6$b=Vx3i>6pYZPN#Q7QpC1x%TT3wFM-#DxBNXmK*qq4{l-x zyddqK>@(SW;J2&YNCRUbhX6a^mwP>;CC+(9!UjFK+6~!Q@i3>&-7$4%ORAXDkE3P7 u&qK-74?ybA6#9!f@PzSNSJ)6zRsI6pd?2iI@5JZ;0000 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/quantum_panel_dark.9.png b/res/drawable-hdpi/quantum_panel_dark.9.png deleted file mode 100644 index abaf23026df0007d804d7b840bc7777dce82b956..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmV;10(t$3P)@3U zr-ZAppz%-~*%H8bk-u8uz;E2jgDG5x1ea4EYUE2g!4HFl8zSP zlx!?H@WW&j4N^hY0hXnBt1Mn_@bdNHtNrowPl&w9EDJDG=T4{BS08?S`}*CB3Q?A; zvMX5~A52bxx7NALo**KlqA1>v4<<*zJC<2q(DWD>U?9dETWe8$NJ-rcRmB*C7;{Yd z=*?Np>|)_m8302O_On~Ap!k?W5^gD3!OLbgYvW$B1{kVS*uf(ZPz7}grEFZ^f#zxe zAWro`e*o@_s)iMntUPT$3OMI>vbX}O8po>%7cA>pa`G-&7q6)r{Fn5yx#(qc(aYwd zm(4{ln~PpH7oC&sOp~m0ne7ZI*|^vAl+-+$GF$eYR4=nD)gtR9i9Q#!XV%T_{Bvft z8b0PmvO&}W_WbABiJjklp={;kL{;_o?cbY^=fBQQXy_uQ%9a2lU=Mf!O#J&CJ=(Yr zYk?{72e<&PfV=qORNo*>ocW0cct+lu9D1@-;Ks+UwJw{Q92U3*uKnu~iFVE-5+`Wp zW7lMxf(NmJvhP%oKeLWS-R1`)&uN2z;z0j9uwx7+2;xp~|3MMOxFWSgex4X_3F9GSIRYyWu)w3dRegLCe4 z){Y$#6JXlqN$hh?39Qu^G3h}pxVuAQ3b-D`9Q8X=Lt<5ut_kLh5$mJW2XiJp4cwZT z8T%8e`ZqWRJ!6Ap6g!onipfyLqH1Md)aH(=mCm{Mj%0Ao6|}6CRpVgS>-9rdVtJlF zQr`D#Zy2Fde?ocVyk0Jsw~NK%N>v+G3K7xGX7jRIt)75q%B!_)DkhZO(Is#JoJBly z3%AdPx--1`-fY_ez_N{iE#SS6|(NyebjEs!@D`cpD4u1lS3d_eG S7wtU&0000 diff --git a/res/drawable-mdpi/quantum_panel_bitmap.9.png b/res/drawable-mdpi/quantum_panel_bitmap.9.png new file mode 100644 index 0000000000000000000000000000000000000000..86be568fd06a34645f0db78c83333c48ae110c60 GIT binary patch literal 436 zcmV;l0ZaagP)KmqAX$Fc3wbleS@jDzRb1 z;ovyER(ltS#G+Kdf@W}rMQo9}PGjMqBGfN=lQ{p`V>|gVs){j&1ZheqAj#}(IyE{o zaz91NK&4{F9$22}lL`f}u>pjp1}K1;YsC+tUM=wHS{uUqDu6{@*Y_f_v({=(6OmnA z*AKuVn1uFc?8|$#-|ru-wM*61jU1OThO#VQtE##KKIoM_ETsV|Rn3M1s4A+u1S*1M zje+NF+h#+(oY#B|JajErN1g?doi;_8$Gm=Hc1gN`FW?LKe}K=Dk^WSvr+ZO<`yF|P zUSTmHXXLPg8Ic|RG#0}tNu8s{NM}sHC4E(fB eeWVTms>&CIH^W?%n`$Qj0000=XWz8WZ@Cq zyYVh_3(qinU3msK-o%Z2k07GXL{yxl%SC!b226F*8OT6?P>@AY^{7;JR~yDj2Kt+k zd7`2YCf}w^oNs6oi!-Y^`Xox7Wpsd{Pz}&J`&XF~ECJH9^NVGgM50rI>kubZY>hzvcx_JSF6k{9I_aEDSc?bjHfFor4=3P40Kh6*T9+DHRS zfMNosU%6O?mfNS9Q)|^B@|KI0YJOf**0#OvFi5_!LdO4~nl;#jtv#J)U9nj%akH-2 zEEU0qDuNBw(SiwJMdW#^gf5mvxp6cw3p5|~dL<&8a3*>AtT!vVy}x&t(oX$^ZqGjj zD!Mnqn49A7L*x~B0^a-Jw4L7qU%;FD&PRgnVr_xi#SE$#bXCiNl5X=10c(M82N(>t r^9#N3WzV9bqK-^_4b}F00000NkvXXu0mjfah$)N diff --git a/res/drawable-mdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-mdpi/quantum_panel_dark_bitmap.9.png new file mode 100644 index 0000000000000000000000000000000000000000..70429b9fc5a05049b8a577fd4ac4ffcc6ff605e4 GIT binary patch literal 445 zcmV;u0Yd(XP)Kmpe|wKoEw%@gr_fA{vfB zPs3R_2FFMn4nf69Xy`crNEAWA2$1aTPQc&cPRxZ5$znR?~?Qc<4M1%pM zLnZ-(#EuqS*-6j)A)&OaluNh-h8=T;LIJj}1nQy!1VCg*a3Hh{1LSs?eR$*mhnH8^ zH(?a7fQ2V`v(2;H=cmVes#WVgxU6;-&yu@5&*!Q`53)N%WD(Dj74X2WVuj{X3Xq84 z4FxD#l{t`5+g2AiR^t!-gBMzH9~dCm8Z#Q$YBe|kjy^LZg4?uw+vVVxz!P`^p9c6S z9_e2#^>|m)POqU^2P>ee`Z5|-_0oS`_r>}M; n;S;SLA}v2{W4BZVpsM@=dKZ3e^SC&m00000NkvXXu0mjfN!YMR literal 0 HcmV?d00001 diff --git a/res/drawable-v21/quantum_panel.xml b/res/drawable-v21/quantum_panel.xml new file mode 100644 index 0000000000..d1c078335c --- /dev/null +++ b/res/drawable-v21/quantum_panel.xml @@ -0,0 +1,22 @@ + + + diff --git a/res/drawable-v21/quantum_panel_dark.xml b/res/drawable-v21/quantum_panel_dark.xml new file mode 100644 index 0000000000..405ad51735 --- /dev/null +++ b/res/drawable-v21/quantum_panel_dark.xml @@ -0,0 +1,22 @@ + + + diff --git a/res/drawable-xhdpi/quantum_panel.9.png b/res/drawable-xhdpi/quantum_panel.9.png deleted file mode 100644 index 1797ad500af021be256feead9fb50128fc8af05c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 928 zcmeAS@N?(olHy`uVBq!ia0vp^o*>M@1|$oMx$giemSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wG0f*PM$7~Ar*7p&N-iT+d<&i{;6*`cB@VZzIRaIh42rd7aO;%zg+w- z_g!84J?6$EOY8ggvi#!NdDEp(D!r_Fg4!*KTkF!6dMx_fd{FS%>Wj-~Ud<{uJ7&qA z%rlSkdO`JC>vu7i^|ZSdX>=J0+>%PSxqaX@zlqh3%vVWg&fTvSIQdqlTk`17Pa18E z6BY<{^zS~fNa*C$<2@d0W>}xw@5``cp6Uvg*Gyu^m=w;h`ChBLWa1NU6Rq5ssQE6p zrlm31Jje{$%D4QoT!T0RpPs({{U?=mt}fT2Uhgtd+Eh6&UU&NGat1yx`R@vEm{iJd zzb|%U*!21H=btrp|5JKARsFWK7WYj%{q*+Z$B)l5)Gh4Ldbhc0V%HJPt?UWA;?|#6 zn|x9`TeoAy=a;O>JeN#dC#l@XF|+^n{d+v~4p&8yh08n)YbQBg4D8>eWBsbz!NHK- z#f70k=X75{OgdMhz2xT^X%mkRik*Vfk!(zgJl)vF$51M!!iAa@hY%Y5uZ5liV7eRYUAWtGv?ncl7H|WbRmU zH?lG6?2&KkyYp|>9-S|_!neocUx~~8&QF^=J%T2Rh-!AQ9QK&*chQ5(!If*l>76eQ zE|@6N(1izm$?pM6I|wWBCSKAzb$rIrlmFXps4iXj@y+YJnxO2pdwX-1o37bvE-;1R z*O4W+7q1OltslgGD{X63t@{(FtTi5D4Y4|6@|_vFIjc=OGWJI3*e%eC6zf!3JMHPt zk1Pj%JbI*bKW}?{`sSMtORQ{7j`g&@HDeNddj0zK`+olZ_vg=<^M|FNebI`Lkkh)c zEDsi~;5i_2;PfT66mdKI;Vst0OeAnA^-pY diff --git a/res/drawable-xhdpi/quantum_panel_bitmap.9.png b/res/drawable-xhdpi/quantum_panel_bitmap.9.png new file mode 100644 index 0000000000000000000000000000000000000000..13bdf09ec6e6e8120d0347eaf8b71c25d8b8682d GIT binary patch literal 843 zcmV-R1GM~!P)jWUjDbD3ssLes`P z-Rd-&HYjydssAM?6G<}1ku+InBu$e7NwcLPa~wbqKtBkAcVQSl3nBJWN>yhQLhQpZ zd=7%(5kOySG=q@1DOu4lQ;`GcEEbEm!)6?_b8==5CTe7z2=_>V+@>gc%FydZuf0C9DV>0AvQ@y3FYPWV;mXh{6Q%N zDP`>j0l?J4Ie$RGWSD1?p6mhWFvjkw2&p*&tH66rSFN!1sz?(1*voLg#!Hd)NR!pYfjUBK}JjlAB!Q^T!GHJcI zL0C1GnN-*fq^s4Whw8twXdGqI_2y|!x7%5 zCKF{OzVCmQQf{i3_%fuF8{hZ8;Ix(}0k`yV*lC{6=f9&U`aT+s?goRw9b>Fpz2x!; zA=b;~(x1&{AE(pl4*(kgA>s;uC>mZQId$a&o=;8 zy8QvLMQk*IZC6X_3nBnJ#CMA67pU`11dTt^w9^{*$Vpe5Nh;-va5Sj&W7^rR11dEm zU7M@1|$oMx$giemSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wG0f*3Z5>GAr*7p&bH6L>>$xTf3xhPkT)JZb9Xa1HO-x>&%zzVeyvVE zZG{zsxA-(a4v~-US(*zobL5+APafrcRFi(3Z%=j!wN&pp-Fpsb2Dgi+4Q=UZfc@ zx$Tlz<~ePhAmi`tW@eLDNnD6YNq)&Si{HtYDZqKwhTJc^JnwBuytE+9boREAPEWos zKYO+scX;wakPA=wZW{@eNiqVHWnTRL{bH_z(n&@`!l=>A=T@u!+a?n)6-$AnOL{H= zvifK3)UIapb0<9e{4n~_q}i@Zd(V98RoQ(g^m*jBTbt*fJNfy|j9K@V)wV2)W)yiI zzuY~eR`5c&`-|?+`j?fNyr(>7U|qJM#N>D3$Kb=W3$1nvAN_duK%KK@L*%vynfm#4 zRo~uzKF)tYKfy0j=*E@}pIuMbGYXxmI%4~v?5f%UU9-r?Un4tpYH85Pd~z3W3kWneLkyR&kDc(tS;F} zS#v#$g!7s6wK9h``m4<>*`1ae)R(T(%6Di-66En1oX>iIojdWE2t`Z?R=+}i&MNSd6xzxX!OL(%GGYk(Pu!PC{xWt~$( F695)PkzW7+ diff --git a/res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png new file mode 100644 index 0000000000000000000000000000000000000000..ac2e423f26f29a35a1c7b223e2da117be7836db0 GIT binary patch literal 842 zcmV-Q1GW5#P)`6pHRA_Xb`tmY zd_LFrI`)aEDk4HnXk86iY74BV3smh6lC#|;nzNl@P|}cWSf}5+Yt&n(W_CX7S~soFTb5lzXG?!Sxuj-TGU-v z-E=&joQTLsjUh4y)w<{W?GO>dAV7j(I37<m+T6?WLM}VyFxG76?)08&`WlOUa~9nl3k&f z>aXZS(YUE^)&t`Y0gDOV7x1?oy&T&1L6 zY0*?B-NAPil6yi_@% literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png deleted file mode 100644 index d7ba87416edac0ee70f1755216def1d24f224ccf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1439 zcma)+`#Tc~9LBfOa(R^Nwp<^~tP4s*$TE*?J4G(ZrR6rt^vKEWnB*SjGKEOUZ7%Vw zi%W!sBcjC^MdjAaorXm=%Z|=D&vW|me4o$feV^|?@RIFpG18Jsk^lfe8i%!V*zJIy zii38uW{Z1ix5R=iaTmpRFH+nmdH0w29qSql07#L43N-Fz&;WpaXq*-LVtBzyp?To6 zwM?Q%6t*@7YSMHf^OKQ7%Q>QGk5=fB?|g}o+5J>(3;-Pg*-w?4GK!6@s=KFPDPz1K z1d5}!L*#mG(ET^-bJE7f5A?~-0m0cmt~KLHbuF;2@g9>TM9P4}*vXmC6OuQXPTGlH z(EnI-N0KPChB@9IRu37ykb>XjFTn%z5cVXS-%{x#LK=8X{&FMdb_ebbDp#sRp>Bl0 z<$gj`(+H2-2{&EVg=P1uj_ajyULWJ{X~6NcYAkf$O$tQvV!hbuAP0a1cxLT8F&^Va zal?1-%%)0NV~J5BMdu>*GKCL>48nYNR|%Hknlef#217K8Ey!5jb{(|*8Am7-F45`q z+#gXQ$Jj_^9VU;xxw-j%S7QVNXG6dTJl2b|#`n+*4;sj2n^_&ShzJV{Yier~IX6-X_4W0c zuV23&L~Oq}1m14(WK%(!3IV--NWl?YCgj`E(o)1--#oh)eR6M3u(fV?&2Vhz>MskkF`l)J0 zpVlM@Q%zcqC;|)p4KaeWv(DvYR@cz^#S=uye<)FRQA&A+bxg+nOONST(6GrdmV)>H z<(q6C^3H?5!A>p?I}J}1T^09YDQFsMpUus;reJT6a`X+7pCo8R=~M;Z&?~@PuXr<9=3~G&w^O5CGs^#wT3Oi^@IIueeO;L|9)5a9QI%+*uBNur9b`}A4guiY zsi~>l?d|O|ch-rDWrOpIN)N`--rstzEguFbKp+sESRPR|tJfzaGE%6l#_Uwb<9inT zwe;!v;7tyPQ&d=3xYpg>z0~3P?BmjgQHiko;2b{3_ajFj5M&Gu4RI+H%B!}QFY`(Z zKA2-n`fh=Mq!Q=$;*S@J?mJ!^;V#;4Zxfy_Qx#L-ZY$oPDVzIO0Torw9mO3u8B1GL zYz+h$Dvv&@GDwii_vSwu`7nREApxe_*2S3DcdA_!oq>|cl_W2NY|V*M_lgurYUrSu z=ktQ#Y+1vna`(-W?AqYk>8X1c7y3zJ0-n%6t`vcB?KT0IlO^{0T)i~I!uG3Vl#}1N zPRg|Mwe0cGT(HVv;_$*cX+ae{;w4)Mx*|S-;g4Go*wh?0dmsDFF{D3?7^CK;qL=P= zU~$qa-`c`fX*E2M!wQG_XU!H_OvN7^B&m_%U>%Q!{tZ*BhefXw`33MJ?>t7|Go5Sd zoi49sP1{_05N2N^L!To4vQfY6)rwY7zebANtqsvjy~)N#%Yx46jyJ&h&r-|vy9*1z Mowc=kV(A(87ok_YTmS$7 diff --git a/res/drawable-xxhdpi/quantum_panel_bitmap.9.png b/res/drawable-xxhdpi/quantum_panel_bitmap.9.png new file mode 100644 index 0000000000000000000000000000000000000000..b44269ea95da4a78603c76a37cdb66e7a6423583 GIT binary patch literal 1323 zcmeAS@N?(olHy`uVBq!ia0vp^p&-n`1|%)Mu80CsEX7WqAsj$Z!;#Vf4nJ zaCd?*qxs3xYk_Lcdb&7zqQ$Cob@qT=Md=OQ6z<1y(tor)AAe6f#%A9#MaYT6M)=cCxfRDYmrh7Llo*-0QSar}DGy(28eMZu5nju>yX)fI zczdx~Z+6+t^-(|g_uKhYJ^zfp)|LZ8E&lzcm&`nO{gKeh($24L z=eav~T~W(?RS}$We&f_tlW!^?ubx%x+{kt6#73U09kCk0iIcK~G#Okn`mPB~Jn`Fo z@z#Cox49k6y;QIF{nMvUtM~5RJD;uj;PMFOm4!0#vGMWs_ENod?viUALLV*an5rgd zvUTbSxrTd3j~<==`}gnsMH;`Bl!}MVF!8+~9~)b1E!F$aK`+dd^Ro(DgvU}%`ITm~ z&;ILLl#%aQ8{v7$WUm}w`+R1PZnvYCHg50R5*u{(_{EPEf1)@(26=I6s$Md2otDb2 zC&;!pjz3Vuk%Lk3$Z4Q-ReAaM^d~}7n_DM`o-deP#<_Lt)~}`vic4LlrDiLO9N1$Y z*NSZ1nGnThX^K1pHm@B@EQ~$;GhNy~d5Xd%O7Itr5nL*G?m91AiT2H%P=XuWG6EiKup?vA9 zZ_KN|o(Ps~V_|>eA;&3dyXLOIRsaF!9z?d%m() z*6yp=#XNI=Ei*_ypcWLF(K(gduf9AgeAxxj1Ctmwsd(m1|8S&9q3^MwocNN38LZal z|CyVc@84G0q-ZqLr%t=f_iC+N;-po&C8c$B|GG~zv-H?lTUWE!mPq~HzoI3GC86QZ z>_%w@JGKu=Ml<)^y>sW!n!lf8Yu~+l_wU}#n?KnOurvH;tY9#3j&oOSU3g&8*-2i# znyc)BtBQ&~9WJr@yZqszh04n>zudok`EvWFFOt8S;-kb|S7|9+VE@2WxrJ|{`mku=HI@3d%c`I5Xj2LGVO4eTevyt|H2H(Qyy0nLmhoX z_ed&D{}s6Lu0|h!z_c~olA@i4pG5Y%YkuBm@vp%sD_S%lq&#T7PmqaL)KW+Jhu2sZ zOfGba>IvE)<(~P=JZbi(tenuGWQO;|{`rQhl6sR@9#Z`qI%U;- z8Cf{rWd#bDZ5RkEP;^#lmdKI;Vst04{xN%>V!Z literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/quantum_panel_dark.9.png b/res/drawable-xxhdpi/quantum_panel_dark.9.png deleted file mode 100644 index 17ba0f1163406cad4cad568e9602cecc5d1278ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1366 zcmaJ>c~H^`82w>dtYv~xm`5AlSU|C)d7_4jt|V(pN@=c|Y3iDHqNWy-x5<=g9_^~A zDW-Ytcw3g{ec)Z<&KigZnR(pYRnR-L9T;v1ikYU}}FeN0@7r zrsx1;%ouDu6$(wvq^+bx~}J731jx?4E_ zIhVqDVoNv-B>L!b!~LVNTYC|g`);&xjytdx;kk;3ga%eJxyTOPQ(C6~A@ z?ZU1lCrX$<^S!{T=5S<}r?<8u0QKwPOl-&<-WO(KG@g&=jK0KZR8OMl5Qv1E^&RM5 zz#%yv2|@q}dY5nL{=N>l>!6?;N%AV}Aj5Ru!5tjRKdV*vURb}9udS40Oh0;?UW5r=c`3uXRF`0JRDF02Q^hop4z{GFtNbohP<>*!Z=0S@`dKofM*9oC0Br}B$9-D^-n6y(C1zH93?F~t!z)zLud)goi zIJW~VJ^HYcnfJlpaCga%&S~`_KFT=#3AXsw-seNCgNWmB?XHY=Vi5R0)^GR!UArOu z9=1yQP(#HJ1Ap|fZD{JroZgc}ET}xJH-~m{%RP1|rhY}QF5$x3he4|ORA4}?V+LL! z$NfZt!`2}*n*D2+3a+@OKTa~w*mz5+F&)d{SZZEz{j86htW2(vJgz*0*H1ppJ#%(| z0(EbSi2Nde=mf3kzE&sU9heH*lX0e!J7rrUMSl#O0|tK5CG^89 z2FSK1%FmdYyxw}2)Cjht|c|kpnNo7`v_qC*s=DPNigwrRsA= zz!Mt}f~P5NwG7W#J~o-Q3_=y4`U-0&I<`Iis8Qnur%dtp$Q2}28^J6igcSb1Hci7< z0jBeP>EbFQ96o9uF>U*=p!p|qJoX7@XLcJm{BN#CY|E}JvThh-*NVl#2w0h)Cp4nJ zaCd?*qxs3xYk_L6dAc};RLprhcYpsK7m?%pli%Nacd@ZWWC|Or;w%=<2?D&jvj1J8 zye=*C@>-$D`rlC_bHU<8oFW1O>a4L7HSF~)7rA&9eeCy4-2e6Sog4E$zKhA*^Io~P z?ELes<#u((pRbjF_sd+naLOUhh5oNx*wn8%I(D@C@^-J}S>Nm9|N6v?t`mB0+}}i# zZ{NQoHajPHp6{~h4{rYWzG>2Oo!d!HiOfotdO^9DM6zRlA8FcVbA8R%xA{lagM2&F z9{)btqPf*uD))WY8_{(^xkkdg~qWI^dpQIVyCrJf;-@I6S`oG_=`{OUTXkVCSA+m9oKa2b= z6(hz8d&(b9K3^`@Ex+K(&5gDeXEWBmPjhz{&;MKbI6Ne2W#$+CB!&g;N>_W%i8$=q z91|BTEXu{;wX(cy+UfU
~P?msHdOFzQrsx{v_nBg%zKf@B@@F0A-FNAv*HSP-(Y5lqD#lzZFzh_vx>0WEUUNqyn zVf#DsE?0>2J~kt<$sT@BaycIISjn7n3?w@GDAX5~dL@s$qRYiFI4x#hdM-)5;w zRq@q*tzGgB=}foVex588n1BACWHoo0_>V0{RNsuG^ zU8beaQeM^`KB2ypiDBt>g`i%$s{7jCdP6?9Og?hSeZ9>k>xuV+R>qyVaHr66qVTZ; zyJ|~L2DAFRWHC@3<(!o&CH z7u?WWxs55}>im@KzZuN=I(%F9^*?6KjHeR@4GGEP<7wMdy&A$En_XlC! zt6IIiT#LON-<~|o9)4=kkK12WCN4a^>BsYvi`l~u{^F@VsITo@x^hLs0iFXw2lN_P z8_XHr>??it=6C+S+Gndv?EZ_qzM53~H{-9;`Onh*{O@YZE8d@zYk1BukI`b){QYa9 zJH3k1Sxu)W#fN-MYxH{M_jgBh{`|$7k>bW8ostbQQ#~gA+;i`rknfc~tpy(Xi?k(vNX$5KaHO?ruq! zL4NV2$1mnrtx;A;n;3h8h5L|8pz^=t_qXwK+gnCG7M0CCaHVTw#sgrn$KdJe=d#Wz Gp$P!%8*N+w literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png b/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png new file mode 100644 index 0000000000000000000000000000000000000000..bc887fe916fe04ce9a4fddeb60f1cef32d46c291 GIT binary patch literal 2546 zcmaJ@3p7;w8Xu7#GjPaNmGn*ORoJJ@qhOW@?s$v69oxHVmIu|YfV^;i0_6C z27QUXQWg{~^4czgHf{Ig@V3YD=zQ$j?=Y@P20{=I!CZ_oK29uWDBZ9#ybMIvstH)k z3NMsy|&Hw-gk%;-S zu!uJqU%&`rdw%hSyt!ecVOYu_5EKdpUO~o7WI_UoPNx%yE(8}B9D=~flf^Jsi4)6L z&N8qeIZq~%!Xk+nqh;hqNfKcP~CN(m%9kq{rRz1Iv{ z4hKR14da_=IVV{P5rQDOBvHmg>LFM;YmDUX?;UA@NHh$8nFuKgH;yggCB{Qy*qiN! zMZVzqB0hsi<_btr01-!~@dP-43{Y`gzJQD4Lp%x{0(jIY$Yqx2TlRDookC)hNuETI zN+PWTm~;;!lS=iV5J5Jb!lKREdW+>SSImQEeTxv^Uu=ngYs+BCATBJCaU_zs*)9l( zmcSBuv_y(wv1Y1{aq#8xL}IPdQCq0b_hv&fQ4+-Wlu6<-Gnr5HC{Z{bNQ#2!5SIiBAS?k1k)Um!zckaV3h7X-_;oapm#@PGiIIttA){lY(6pdX z^K`x0Opdbqd0~@}bFi8EW#gI{v!HZ1AuWULRI$Fx-ZrFQ^}2eqX|yQUgBUr%;LiVK zWc$h{(92xkBx0d5x$rRMwDZ|Ow(k44>btFX1@`nlg)r&g5054)hCXDpRX(dHpU~{k z&=pA?PJ6xBxj|V53-`9>pD0NiH7y>__s~a~9vd*rfzo%gSS)q>q zpsLLC$_25!5l}Kid&`HUDo?3UDBMOp{_DvnLqpWOpnV044GnkopXz*82r~-bc6WD6 zj5z(YD$M47XL7w*C>*-AXV0ELf`fy%;hmi?mE`%bSDiUn5%V42Y@dUDU|h3BV@zGo z3QL!K=iHwLGc{=6TL0l5{l4kx>EoVfMji2&_vgR-P}tbms4-cvVERC~*Y2wFf2L?s zDX7FwyE6$pcYca3aA}%zY|3!c$g|SYQVF(*bV+q{CF=#CJH9;VscC;}YiqDvF5kB5 zAI-1AZ>a}D?VBH(1O?{gE#f9^=jS>I0-sYTln7|!$oi%_JD{^=W|MU!TDpyCSoGb9b91t zVRJS(g@naD>KgstqdQ_;TIdP1@cS%4-0MdcON%_OY`uFRsj{C&HMcKppp}FWFKkABkq2~t?dA9=rC!!G z%|p9dKTcOmyOX|&G{)1_{Mu zi5mfuzZF5U>w1{+lFHNz_wvx`C{tZ`eU#43Zi||O$hIg%`FYoM*UJA3_`fir4QBd* z20(AzvM4pj17W&tV47U#x^TI^o=1&QP7Xs|w4vNkPq#0@S|>Vg8J0^ z%$=mUOzF#*IgkiS$$&y2TkdBF zsziQjwVH4X$g-<=5$i97;c;x~SV=0v3dMxb zjBLY7`>?_L6u;{=nRn&Swzf8LMf>}Ksi~<9WkUg>1S~Q)H*bm)i>EDq-v9Ha64i2g zsl{QBL%`}jFZ=OvOu?>l@fTVH-`$lhq9FhzTZ^}YS` z=1#wVrSJYFqFdM@eq6kND7kWK|GUsm56z?gcV0<-nRO|n$`{uL6Q_!-97p7zvdag2 zB8?v@-&neC^ErCe%2G4XpKD!VF{rxA(F^IcDjN?mz9iZuQ3>tN-?*7$3$4cC7Rk@S z4I|`VYY(cM=Oh%D23(vwyu|fP=FLM13`|nL@sm6C^*JY>m$cvbE^Vj>z*R386z1<& z#4*NlxiVoPD$7iTW~q-VM*6p+lf%4j7hF7)*SPITTO6mp zb1%W0WgfO(FPCC&)OCXB(4CS$;NBQA0d_jF-sgeoW!vl@tT5LdVr1vc%iM9AP#dVw zdt!NdM8sao-k`IktoumW(k!EBo; literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png new file mode 100644 index 0000000000000000000000000000000000000000..7cfd6e477a44f0188a9f637fbcc321cf32d5f9f0 GIT binary patch literal 2531 zcmaJ=3piAH8$ZaU(k8mF$Z3Sw&di*-&*YXFq6~6bgqS&VW=zb*%rKKyNo?0oN~yIW zTP`IevE9wLUl+K=|RB{%9pjNB#YBFA?5D{P|lSv?w2qY4OAt2>isfwq8q)Piq3mjC5D8zD= zSSAH^7I}PGvdRsIMfy1fiJZ&*Vpyu2C=^yQf`%t2z<44-BGKjb39VEGqyG)#t7v8D zS~*GxMwPN;1%mZMXg{fp)$Z>d>3~=?tU!erYYH!sBSVrUs8r?0al>JM@B*=bMI`ft zFrPw%$P7dXQOFcJ#1ja4kN`z!Oq7Dq`6y}9&e!yrY$grnkf}aIDjkNsDNC7N#HDn) z7mY~eFllVYq^_S-sp3fybkesN^F5(U`CDBUTY>UaGDWCNmN+>DLGdz`Oc^hegKYMv zu7iuXJVY$j37vI~`kXfhRftnifsaBa0Y6omCH_hjLIDGzBUB zSV$qFR3e|sqoBA6eZgNU_<2$>36_a`G9VU}%HYvZgb$Gf2o-{1Is;ufunE<%UseNqd|573ifxnvTOEJrquBspIO@k)8mhTHR1mn` z#@q68#TwSx1kafj@xHi>K4^YuMtERh=AZDn!Rs@3?fhld)^I|G@q*=3xF$w>ICRHv zf7&wrNvps5d`er2>~3Y{<0Bq-YRNrq2HtHRrQ6?hw?(~5dE@VgGv9l758s=^uX6}L zLblRBc{kWZ5AZ5uWZ`UIyH<(PlllFuN`23%`>zM=iP1K*GM)5jCR?WF<{7pdAFw%P zKcJr@7~8QU3CRQ63i)$}lRc|e+h0RYXz!byj}z)W&op+e(`KYO8a_-_qBSw z>$?G7+)Ef#ldK8`)V+F!6P(2{e(VSB+iN4GQV54+*vz1KH1V3jA3NaTXTvdL12yluZ z-J@eS!3X-{i>28GmE$97bzIE9dXH=x0*j2bzUjs_A;+59bLU4MewR;ksa980h*zvrrz$by6N+<*j`95B4>ak z;Ht*jbACt*KfwJp*UDg**IB<}Qi^G_`G{7}(~@{S{e=Uk*|M>>#d!7e6$5I^YtbiT zJ%$CQu7zGnmmPAzvC^Phbq1B58>=mhjZRlhPv5*`A%obSem^Yg<;uqC8?E=g#hdP< zP0un2zqm0n&^9A)c6DOb`c*T$SvkRrO^pi^&&gd9TMW|y6FqRs1T_QnG2RUD0!%(r zJy6I0FW~>c?i-tZd|BHHRCpBrv*;C=h3P`p;D}U>W0-xD89?^*dK{hVQsQo7qWO+C z|7a$`sQJUem3BbPlEMWauHRlk&6sxb#OYS%uA58lnXP@9@P0E?xs|?@h;q8 zFgwX*+jtbYFs<3E#lFAMU;L)%#lyZw`Rbg8mrrwFP_H!S{!o0>_n~e5l_hVUKInWT zx;LxTMHn{Z8WJz64O*W$So(hbo7Y{Wy?24Rflua)sl%EzrqI(TQ^3gj{F3IeY*A;^ z{SO6p9{F6y?wo+0TYGEX_WfEU+Yo(e$E6U4Cw{TBKnWd34d*F`|6Eg(Lq>bbdxW>@ z^SkTYVl?kh56^RF)Ygn;hdw@MW)NF?AU@W@t+_1s*+<)tX=&qwOZU>slE>;|>;2xJ zTMNh%trrME24jl4s%sa#t`7+MnF4VMih|IAu7y1sXb}<^(XM{Jmoq0FEVCUmuf18+hRbw^{4}G@v{;>i1`8oCY2x~Rj zsG1mD`iA4UVlcWEamdE^t(cq6KA&`TM_6nABW*d~efywkWN;~|0|#%uda>61iRB<_9b3#lHz#8wy!wy{=#~XLQ%9bo!-I@5* z#@w?P*dHZ4aG``fV%gZ~W#A|(u&l8vZ%I>t_cD>jq!yn;0YcH#0*k~eS4sW5^CAb$ zY<+#8@ - + diff --git a/res/drawable/apps_search_bg.xml b/res/drawable/apps_search_bg.xml index 405e8447cc..57eb5825e9 100644 --- a/res/drawable/apps_search_bg.xml +++ b/res/drawable/apps_search_bg.xml @@ -16,7 +16,7 @@ --> - + diff --git a/res/drawable/quantum_panel.xml b/res/drawable/quantum_panel.xml new file mode 100644 index 0000000000..1f4fb711bb --- /dev/null +++ b/res/drawable/quantum_panel.xml @@ -0,0 +1,18 @@ + + + diff --git a/res/drawable/quantum_panel_dark.xml b/res/drawable/quantum_panel_dark.xml new file mode 100644 index 0000000000..6642e78ac7 --- /dev/null +++ b/res/drawable/quantum_panel_dark.xml @@ -0,0 +1,18 @@ + + + diff --git a/res/drawable/apps_list_bg.xml b/res/drawable/quantum_panel_shape.xml similarity index 93% rename from res/drawable/apps_list_bg.xml rename to res/drawable/quantum_panel_shape.xml index 0e56684b54..1083615768 100644 --- a/res/drawable/apps_list_bg.xml +++ b/res/drawable/quantum_panel_shape.xml @@ -16,7 +16,7 @@ --> - + \ No newline at end of file diff --git a/res/drawable/apps_reveal_bg.xml b/res/drawable/quantum_panel_shape_dark.xml similarity index 87% rename from res/drawable/apps_reveal_bg.xml rename to res/drawable/quantum_panel_shape_dark.xml index 07505a5967..c3821c416c 100644 --- a/res/drawable/apps_reveal_bg.xml +++ b/res/drawable/quantum_panel_shape_dark.xml @@ -16,6 +16,7 @@ --> - - + + \ No newline at end of file diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index ab349179ce..d75d6cd3b3 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -14,11 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index 5cdf56048c..b91ca26182 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -30,15 +30,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:visibility="invisible" - android:focusable="false" /> + android:elevation="15dp" + android:focusable="false" + android:visibility="invisible" /> + android:elevation="15dp" + android:orientation="vertical" > #FFF #FF666666 + #FFF5F5F5 + #FF243036 + #FFFFFFFF #FF374248 @@ -39,7 +42,7 @@ #009688 #009688 - + #FFFFFF #C4C4C4 #263238 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8a8514a4bf..2fa16e7a21 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -103,11 +103,13 @@ 0dp 0dp + + 4dp + 4dp 10dp - 8dp 24dp diff --git a/src/com/android/launcher3/AppsContainerView.java b/src/com/android/launcher3/AppsContainerView.java index 989026e36c..a74670be0a 100644 --- a/src/com/android/launcher3/AppsContainerView.java +++ b/src/com/android/launcher3/AppsContainerView.java @@ -35,6 +35,7 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; import android.widget.TextView; + import com.android.launcher3.util.Thunk; import java.util.List; @@ -380,12 +381,13 @@ public class AppsContainerView extends BaseContainerView implements DragSource, // Update the background of the reveal view and list to be inset with the fixed bound // insets instead of the default insets + // TODO: Use quantum_panel instead of quantum_panel_shape. mAppsRecyclerView.setBackground(new InsetDrawable( getContext().getResources().getDrawable( - hasSearchBar ? R.drawable.apps_list_search_bg : R.drawable.apps_list_bg), + hasSearchBar ? R.drawable.apps_list_search_bg : R.drawable.quantum_panel_shape), inset, 0, inset, 0)); getRevealView().setBackground(new InsetDrawable( - getContext().getResources().getDrawable(R.drawable.apps_reveal_bg), + getContext().getResources().getDrawable(R.drawable.quantum_panel_shape), inset, 0, inset, 0)); } diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 377e8eeff2..6e5941cf24 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -27,7 +27,6 @@ import android.content.res.Resources; import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; -import android.graphics.drawable.InsetDrawable; import android.os.Build; import android.text.InputType; import android.text.Selection; @@ -183,15 +182,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList // name is complete, we have something to focus on, thus hiding the cursor and giving // reliable behavior when clicking the text field (since it will always gain focus on click). setFocusableInTouchMode(true); - - if (Utilities.isLmpOrAbove()) { - int padding = getResources().getDimensionPixelSize(R.dimen.folder_shadow_padding); - setBackground(new InsetDrawable( - getResources().getDrawable(R.drawable.apps_list_bg), - padding, padding, padding, padding)); - } else { - setBackgroundResource(R.drawable.quantum_panel); - } } @Override