From 3f452c87db9c3639285eafd17fff6a6f9d28da44 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Thu, 19 Sep 2013 11:57:17 -0700 Subject: [PATCH] Adding some assets / fixing a couple bugs -> Adding wallpaper, settings and widgets icons for overview mode -> Fix issues with disappearing search bar / custom content screen when screen is turned off from overview mode. Change-Id: I0904098bd642c40709e27f571e458f1b6e479c17 --- res/drawable-hdpi/ic_gel_setting_icn.png | Bin 0 -> 1694 bytes res/drawable-hdpi/ic_gel_wallpaper_icn.png | Bin 0 -> 1456 bytes res/drawable-hdpi/ic_gel_widget_icn.png | Bin 0 -> 1111 bytes res/drawable-mdpi/ic_gel_setting_icn.png | Bin 0 -> 1082 bytes res/drawable-mdpi/ic_gel_wallpaper_icn.png | Bin 0 -> 1025 bytes res/drawable-mdpi/ic_gel_widget_icn.png | Bin 0 -> 898 bytes res/drawable-xhdpi/ic_gel_setting_icn.png | Bin 0 -> 2386 bytes res/drawable-xhdpi/ic_gel_wallpaper_icn.png | Bin 0 -> 1949 bytes res/drawable-xhdpi/ic_gel_widget_icn.png | Bin 0 -> 1386 bytes res/drawable-xxhdpi/ic_gel_setting_icn.png | Bin 0 -> 2937 bytes res/drawable-xxhdpi/ic_gel_wallpaper_icn.png | Bin 0 -> 2602 bytes res/drawable-xxhdpi/ic_gel_widget_icn.png | Bin 0 -> 1910 bytes res/layout/overview_panel.xml | 6 ++++ src/com/android/launcher3/Workspace.java | 34 +++++++++++++------ 14 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 res/drawable-hdpi/ic_gel_setting_icn.png create mode 100644 res/drawable-hdpi/ic_gel_wallpaper_icn.png create mode 100644 res/drawable-hdpi/ic_gel_widget_icn.png create mode 100644 res/drawable-mdpi/ic_gel_setting_icn.png create mode 100644 res/drawable-mdpi/ic_gel_wallpaper_icn.png create mode 100644 res/drawable-mdpi/ic_gel_widget_icn.png create mode 100644 res/drawable-xhdpi/ic_gel_setting_icn.png create mode 100644 res/drawable-xhdpi/ic_gel_wallpaper_icn.png create mode 100644 res/drawable-xhdpi/ic_gel_widget_icn.png create mode 100644 res/drawable-xxhdpi/ic_gel_setting_icn.png create mode 100644 res/drawable-xxhdpi/ic_gel_wallpaper_icn.png create mode 100644 res/drawable-xxhdpi/ic_gel_widget_icn.png diff --git a/res/drawable-hdpi/ic_gel_setting_icn.png b/res/drawable-hdpi/ic_gel_setting_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..f8059471049fb84acef2dea00e3b2e119275e131 GIT binary patch literal 1694 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 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_gel_widget_icn.png b/res/drawable-hdpi/ic_gel_widget_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..2bfd2c17be62ca2a42f3976a3c2468ff8efd0068 GIT binary patch literal 1111 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&!-9W_3>&$B>A_Z)Zkki#Q52?7#K)u8Xft zfOw#bK+B8f@0~x5x&9f+e>M(r5mA;?Sk!ccyGJOsH*NFmZwptISF0JPJ)iJn1FQ44 z>R&&0En7E}^VM=E3p6|I2*fw1D3k@mW-C%vdc7b3v+Y5&9 zxr9;OlXF)4 zZ$2?WFej%mnd5O3JKY~`M> zNoVJ=r8O*HGH1Et-bcBcoudyNop9sE;{&Fbe+2}VGPd*hC3J1p1Zm2*5C8hSv1uYzCa zI-|u|4To@1{w)ou4>&gjvOmawFn#VWtvSrQGTL4SPo8XYLE-l$KY254F7Y`}6s3N& zO3hI@qRp?v*nKTetVM)5#-;d+!P~2{EABIWzc@q8=(0t7$${br$vo;xho9K3s9`TZ1)UK9qrs@^yHCk#uvR{oj1&7F49~dgm-Yyapu0d=8Vt-JBIU% z_O)0vM=hwawP?QOm%)C*?p1HB3F|k{TRGfo7l{S`?X21`t;;IZb$NaMg3zy$SDrb~ z+}bwFX?mdS%nOS;uEc*zZ(u+B#*O<%WOFq`O*r4lt-;Ut=HGf5HKjXV*W`%K!qA_L zX5uRsF8I-P>xod-XW2FHy0`r0E8UZL@D^L%EzZrW?(aXzP`ZKj_7|1{+0scR9FsHt zT0RIl_E)aJn&FU!?N^_-sSJnrTzI#zZ@OsmuHt(rX6>U80RqLZU6JVLGkL(7g|cG&qdjCCY?F`*y~5h^^RM<+2XZUlT6k3 zRF-;9bAEiP;o@}73t1_mwG;K3cdVQx_**ApL>UXHu^U*by}clQVO+IgJM zi*Gtr0P~J&iEBhjN@7W>RdP`(kYX@0Ff`URu+%lQ2r)FbG65nBT?2C~0|WJ?`kPQR zDSr1<%~X^wgl##FWaylc}H#&fw|l K=d#Wzp$Pz3>)5CO literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_gel_setting_icn.png b/res/drawable-mdpi/ic_gel_setting_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..096e6bcc8eba52bfface427daedd4632c205a667 GIT binary patch literal 1082 zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZN!3HGrIo|64DVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fI|H(?D8gCb5m^kRJ;2!QWVRgx12dPWi(`n#@vGN7J7Qf$*dDy!S9iCw zu{;*;s{*GZufF5U%&Gez*4e->O{-C60yftxH$^`~3g;oT};nD@_)Qd1-F-*MH9} zk}>PpCW*5G(xS8bF1GHFQvb+Xw|P02lw9SnZN0uLf8Z6HODz+vN+BDb8O^{&`*f|AX9f(=i0;d zUWeEo|6t4(x*}{bV{4IG=I)x(i+9DN<)5>Dk@)uTw!!?Psy8rcx8`qS_19aC zd*hbulsm7M{`iN4eCtnzpSv{n@x~o%{IgGRcR?`67eDqpFZc2CCs=LsPo97HX$5!w zqpk*@$J{P?PKn&&vg!Z6`FWDexqEiYyfnEVES<8Bef>e{&NmEloS*p? za3|>X#PdIn-x69aBmHs4w?z{Cucr&mSeE%rx{l}fN6#5KM=py-s9%h6D06*fxMy*0 z|Lv`{e>Q(pvY4f`hgn=@y|4O9h4U+AYGl4Y(Av}c{_s1i+{Np=-@kfux8b+)&()!J z=8xaa*(|*@UbWm;=E;Jl?5(=Svimz_uHALfE;Nqo-V&esSMklk^c}k2nwHI0+>)Rp~F5d^D zHOq_S{(YYFUXr^vcGcE2jy2vV6@K0mY0KW|Rqf2{#~70p;`l{tzpH$pvwZaD+wKA% z=G*UeTX9*lnCr);pO>QJ9_MdbmYFs&;J`m%_E0TxjVMV;EJ?LWE=mPb3`Pcq#<~WU zx`q}ZhUQi#KxCn7U~Xk#puSXp6N-l1{FKbJO57U4eoW^BYLEok5S*V@Ql40p%HWui hpOmWLnVXoN8kCxtQdxL16_ke=JYD@<);T3K0RW1X$wdGF literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_gel_wallpaper_icn.png b/res/drawable-mdpi/ic_gel_wallpaper_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..61a7b7ee139412d93ddf3573e0f5c0ce884e21f4 GIT binary patch literal 1025 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&!-9ri-2~jv*e$r(W~TmvI$1_A&nayIUV` zwKyzs5fc+qpJ2gyuv1!HK>fj?>5rTX9&s^#JSW-7EfmDpa-!urM~6p)fY65JmL*%a z+ur+_7bTS$m-Q;%zclphk~ziga_b+n-f?{X<5XdZN1@$e=^O6TgI=wTxLk1Iu~6Kx z_cM4Lq!X+8+Y9si%$cVZopaY;GQ}MOf{T&cQij_Yk>uHvtMtoJXM$t$!p?}To} zEeqd;o8+#ZwCU^dopbQ!hDu$g+sD^R{m4A!7cFV+yXy75s}J-N`Rmy}Xvdti{J+cV zrqKnHOVg*@*z+9SedCaGh1$FLW4B)vovURnQ(h2Nc)PhamwD#Hi41Qa#=QA1vVFRx zZ1Yv4`;vjCyb*n0zU^pO{z2L<|IdoAMr^OAI^B>tuqjAjv!j^MzhJI(<)GVk(~IR= zJ8eCfFO)Dyu@$o4f2^A75c2izj7?FGq8Ap3uCSZ`F#S$Q*OSaWUEL4Wdk=2Ym8uq9 zu}tf6R`Fkcxue=%-A__Cbh;+4VP0isUYI;#*YAl-KcBvIqkUE69RIKelfM0d$HKE} z&K9!HFWR(n_l?!N9!iI;kCM19U0?fSXV>|t=WAD;wYW5E0Z?eFqFrEDGWYcloku6w zEzDV7xZ#}F#9i59pNqNgKYF}l-O=JNhHGBVaA(Nm4d8v%W@M^%O5q2eeA^-A0I!!3 zQu-~0rYEu)G+PS=y6QMC925w-93lN(cd5SKv2N*)L4S?(XRGahaNOg+|BnNUl>BRM zzq+%E|NKMOrN7TVHcZ`geF2};)$|XoLAUB3#4epUy(!^R&B5IU|86~sPqtUuFMXiW zAuaKD>YJOt6OFmDrpoT_6Q6hFbMND`0sFeuoz7PO@X-7n?6~%`SVZWziinx_`rV(j zPdt_TH2i_=(uLtoeFvv8tZwEz|L`Wq0`3b>1GbC3V9DX!;`=&og~)>2{7h1Q z7P!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&!-9rXWuj#}JR>Z?E0X3N;j9d!WC1_ioYi zVUGG=oC2>%JBA2+~WCS{<-X$OJ(@}UMP}dztx;9kz~fO zfBMfy^MfW8ol`GhJ^j!?bCKnq16R2+xb;{rc>U0MC}wv}(CL(A{1MZdnUl^5nk5TP zPtNK1d_&A3_3_LP@kdrm6*SB*>{?oSpzcBO)I-5H1Rt-IitnxUbAQr*>W+d8Tj3(l zgrm#P%s;Si$LuuT`!bF)$HVR%ezic~aM9Wa3#QecUbfl7^~&#!oZYpW@s~C?EG~R? zrTFfqZ8~M&ShaJDmlR*QY@aO0|Dj0v=$!|)b{U%Us@F(9lANcItFmd*BrPq9A5*PAb#4iFefMjN_O}yz)s$vkzIJ(bhu-VB#&V~1Vg+LH)pu@Q z-oWo7@|E#)aOsv!&$rzAA)TZ8?$K?L4Vx}*-%y`XS{UQ$RXN4<>4FK|rL$N0Gp%m5 z>Mc!f$gax|S@&<%U-sYM53pHHocqm9^i{vs?k}0y{{&t{bu4#{>Z-DP6PbH(o$Ftz zoQSi_rxf37J-o~QrYCo|fc=$!;b)@%AI;nHX=}?D?%kjEWnJfZ?hH(3swJ)wB`Jv| zsaDBFsX&Us$iUE8*T7QO&?3ap+{y%qEOZUbtqcs*m+Egq(U6;;l9^VCTSM57>3l#9 vk{}y`^V3So6N^$A98>a>QWZRN6Vp?JQWH}u3s0tk@&bdWtDnm{r-UW|L(h3f literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_gel_setting_icn.png b/res/drawable-xhdpi/ic_gel_setting_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..fe17163b1427261bda2cd96688e7da40034c3ac3 GIT binary patch literal 2386 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_gel_wallpaper_icn.png b/res/drawable-xhdpi/ic_gel_wallpaper_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..d9472d981eb54d576cc7dd25d7574371b0d639bb GIT binary patch literal 1949 zcmZ`)XI#rEjE8@Q zBut#={(Qg^gG7jhg9QN8-j?19fQoBSw6iT4cs!u=PF$!4**QA^z&Q;7U|#`%@8TAF z1ps380brE|04BKrpupk@PMV1cSfIVF74YMy@t>AtiaSy)JI`n_+Wj|ddQKk|PcbQ0 z7Otme8uL9Pl&t00&y?3I|0r-^bwd|x01z0b>?C(Zeg5pc+&p}-tHa;?MkHDaYpw)N z=dz%d;a6z~I9x#EdNotIT>E#^!f{e_@tvi-nYA5(pyDr&md}mgPM+OiAWo26hOZ2+T+{AtsEjAv8bBvi7Iwd}8Dy z|DjaSB&T3hj$M&gj^n^bt&8qd7v&XD8wWWnU-L-r1uzu)Y#2wo!C&omq`~XHL$=Su zhx_xNqb`3*Pc&nT+8gUfVOh3Kp(>=zfVZZf>p_+3iVb>#N0;u3j_$^<7q!lvk`7~s zj|Qx^f@07YY$mH95x_B!ec3u`{pns=e|QbD6m|b$qQwkoF=&@9N_@)iK!Q1(OKGVSc_X zjah=}UaNp}qZ2T-S*YPcclLRXZ?IA-tW0_-J(}pUaDLbQxwiPM-ZM~d?56P$)B`jC zznFGMVAST$&rPc068sAPI_%0;7q-)Qdp0rESTAj*YWxT~s*JihzyJPpe4TpWY#wcw z^s*18SJ(Y^lvjCq5lg(@7_T$pE%dW_xyDsbo;m4@yc*q>))`kI+!js>|1E7#wr+X$t{|86ipB+sY|hsSa|R}!|L zjnH*{1}6~H*=$t;(1)4m5-JFrC9qDzSICg`nR85V9;fA6r)vUCEnEfS4}QzN@$Q4h zQj*BjV5T_~P4+A{Zm98CJH0&xjT)Ha?K35O{21&Ec{$Qodpi?F2@d6P^!bJ<*#-~R z)JiSNU*XvO+g{|1yDmW!4(iLxh6Y3;s#npw<;*t$>iwfKOTJsDd9mddafmeQg7~18 zklB!7pEkCGUs}6qvKve3-$&mk={>v7`86q|mGVmWp!YA*y@5<4DOGQwbzOBDcK+rM z$qTM=s0629GUyA%?C=gM``B3f=Wt~Ou&V9#t#gG%V-|sE4Jf_t%HmftBp~mh^{i#a zyicq{D0dVd2fCya(*_+c#*YpY@Pzy@L!_?^+eX*-z`;9ibkoZ8maoh(9rA0xgG1Uq z-x>`YWOz18ZV)}+X2GO(is-zsLf9t+(T-8Z2qSk+do?z%7h2(`Q9aph61>;eRmDZR zrJvg1oCUk482Mbt7eKUvJ2LK8VU@nrv-SNj{kAJ)YH6xggmCF{>Jk&`EJySVqUl zZyNF zu}k!#DH7jhbecnOQ@OS>HbH!!QknPTw2QOQ;^NjaT3l%U!_^G*2x?W$gV2$v^xxpn=X^oqN#HE-C*Ej`_M!}XEC z*^`>5F|j$r&39|}467mP*u~GipxRK(^M~yrbHaLIW?Go$^qY64ee!y$zuk}JA9o58 znh%T-Iu|48pH5TPv2K0SOuPq8MTT4D<0hpTP(J_w literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_gel_widget_icn.png b/res/drawable-xhdpi/ic_gel_widget_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..da6e3e9c2ba3360246d87fb2691eebd5b184956c GIT binary patch literal 1386 zcmZ`(YdF&j9R81u&?cE%NST!|Mmb|q(UwbR+Hp)%QyUv8mmNk3=dTM^Jw^_dbIjZ_ z!caMw9wXN{kxT7}>{O3(8%oIKICH+859j$^-sk=Op7(jbyh-fpfy)eECZ1=$nm?o9%K_cb0MS?gn4$v!{vH76v43m)!AbE@2{`FS05-Qu@U%2baZzKt`$Z|x{ogs!ed&n8 z4(~y5@wxDJ_WoG7A!P^HT$9%pZ60#txd2B+wj<=!dxb(zV^lnsTOx9SQpts6}wVX~{UT`Z;&;&o$&qmui16Fs%AQ$t11of%tMWbkS@+eRIsj_WqRi zCLmRkx2>@>%{?oI@+Bh4*ljW|p{^%ODA~1SOo6n2@t19%|85>r{ZYe~x?x8>X20H; ztyP|_U!fGHdNFEr_C)g6^`>NE=N#?yfU%(g(4nSi!$YpBeyxF!ZJv*r1}6S@|tHu%MrHPt(ZZe1#8DweGB6kez+Qa+IK8l)Rb!VrWXCR9_T76@*L!x1|Q#Cwp(`xpM7|+am*YWJ!ZquUWv}L zERoJs-szhyFXq8`LH^`-DkDA-RgQ$3%6EI`(ena?IV@)*jr7P%kn*Mhu?}-LCTrbC z2!A%YO-eLe`9t)?dU-lfUj6a4)<~46nOIEa+DXCb?MM=?o?A(?L{aNkPKCdBucRzb zh_7cKJe|CDBqOAy&{qskc!q@;GN+@D6I&ZJ6Cmp|%DG4@nq0G2Ile44D6_<^%UR+o z=WXw~Gbp*icaxk>(yi99c;!>ss?m;8?UJCI(s_*+3^ktKP4w;@>omoTw9?`}6hnu0 z<``LLiQH+{@Hz+3#3=OI!p(NJ7&CLWJhT-$CveuIE(>QL68v$%fYR*QeQiasw4YPja%<#Tn{l_ z_*R5n-StcNZtcE;8>ZxSB`-!oZft34m`-Q7pxi_`;#=b8!4gpg#hmXg4>)IiI@(RiS`HpA$SboFOb~U+UraTGahb58rY@z6=a>+Cn_4he zj~idk)1ft-VHTV^x!LpeVPRv{bHuDc#i;J*oG%DZw`6PvGy6EufN7CtbNr2xPV zYkLrbb;Q^@_}Jp`hZOCA!Q${(?EVs)+W!c`BA6jTasMyyUAc=;2n@CyevAm>TxLYF j02gLN0Bes&7$cbF&0;X)e(GjzWgg%`^deNb(y#slu(4sU literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_gel_setting_icn.png b/res/drawable-xxhdpi/ic_gel_setting_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..813716def8bf227fa75577b81288ad3dfa8e35f6 GIT binary patch literal 2937 zcmbVOcUV(r7Y`uQB9&D}(Gb}y3qleIBLhecGz=9Llt6+YWROJm6q%wxNWp-Sy%Z4< zBLa#d2q{znQL5s`N?dGZ*!l&Pe%~K``p0*ld+$5$`Tfp#&w0+xA$z&2s_3Zz0032@ z2i`|I`br68OB9~y-k7bT`S0swMh z;eP&He@_xRgh{udtjXBK(pge80O05x%c6ut(73>0+JSHe1~lE-4FZN!F`!*`o)AwK zjusZ~5znUi#(VjN#7Bgns32!2pkpjrNqNVe-Z7>MTeKYl4YLP+yFgNH zY-%Xl2k-Vxmvn^zg>ktoG#DHc6Jrwtw_&mmfT1W9YK;R1vzAI&bK)3WN~|@5vu&LL zPveBJ!&%&LCIh&}NC{>h;$lEjOTW56XL)-5P0ZkY3zRfu;8+R^47GuP>GU~R>_g))53xg}=MlPX9W0IAzbjf3lv;!SnH?@Y6iOtX8FGkDV{nOh z3`qLLh8j*qmk6W7|G@&7Jsyd~BA_rh z46^Py3JyWwZDBAx+!Y4;hNb>LQ3Fej0k5UU|D?OVFHRLwe2X2~8z^suC+ZuX{v5uFk)RmtKmGnLr z#J8nxFzgLVS9gTmJfhSHt@6p2^~R&B6wLSy`LKst%Ki@#t-C{G4&;A) z%n*W?X{C?u3+_KDTW%K6tFBxL3{!T8*~*uaJnKw+kDB-vHHyco#ADQhu+R3Rees5c z9!DN4WACYJzPxsq_s~5xZYqWu;BjH&b&Y%al%kvujn`FOj^i%wSy+vn5R>{~)6cL* z#I0xH7i*4_tg`gUdAkHx8XOd+3=Y7OBqT@Q?B|T9kk?Gngr&vwjx9s6S)-}3IWxms%G`*WLPmN~O3REX$ z(o;8I1C&p%bwhNep9SmikISR%~i2{X0L_p^A^@cSpn7ihstBGQ@cO?V)lounz^5| z$E`#QgQW`iJSwAO0d`K_n3pn~;yr8?SWQj>WHpam`lHEmheD^OQKT|mY^46~$GX3o z$w_+x0;*?K7DdlqI&TbA)ZHGlrC;I&;}?NPj5N}#+x$g`aU}TEyBhOFe3eXJzsin& zO4oAUsX~a$$wh(n1FXN>R3`u@oRtKmAe{D4k&(Rm`yQ{2paVluC$cKcP_i5<)bLroXkyPcb^lGxrltM1{8@Pw#XH;R!l zGV`+ke6ZHG-V1Nyz4i@jLu#jz8+(v}t!4A7s;1i|?@X14hhH(*5PC<54%2lzM`P$-GZM z&nZG@LAl!5olzV!y>xO-}D=9k@F`VGwh=?3udI zvnZ%cs9(p+5a-Jj(hZypJtAZ`pJnVekM69y@T`(qXc5+0_jMR#P zJ-MXg@aATjRRTYPEm+wtjBXpZih9r~zX*Sm5w-J*QxCqG*B%xsZi{*mS#2QF(p9%N zCvPzNUG`RsA%8UB3}H_FyywaIqS`y!A(7?&9s|WX6^>=m7b3RoWsknN zc)I-2@2^SLe-S?CZ(3`EMU8~DHb^}M(8*Y-I0a;_X82k3D7u22>>rnUAn NOeA>Wo3TNM{{xn!=A-}s literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png b/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..3525446060fc3e0dd08923d011912e14133b3ba2 GIT binary patch literal 2602 zcmbVOYg7~07M=)+APo;eFrYBTr67g86Ouqc@&d#d8YqtnNJvJAm`n_V2~b^#qM)c% z5QQpARpee#ih8XAYQ(BVL>{$OP%(&w3KoM}ih_6t6?=cU`s2=;InVuld++b;v(^+u zEDOQUaGe1F06r{KC`0>*$yW9NpxQYg-QikEE1K$WU;6|AdNz$ktyiQ@})AkOcs~s2Yz^n zs5hN*C08aCfAEFQc*Il$(Q?UTy0C~N+chNHR&IOLM0;` zN|ll;8Y?5 z6hyK>FNs{C(o8NanmnNQ`3fPOYAvJ`>tHqbPGPR<6A{q-glsmSMWxYcl&Q=)bP7wz zpwWc%U>flQR{8&^Mn;1nPnO63l*`l-T7#3rkHwEpK3*S4gWee(dO1w5Sg!y87aJxF zjxuyT-LHnDL{8WHHTru)YvDZSH6GMb2NVp+-*&&gE!PE z=T-R6zkLCh--SxA^OSK+9E6HbcW+lt4bgLvKsK&;yC#hHSzBz%LCUt%> z-S}7AGq3E6HnWnB3ib|TrKD$J=41BmF$<5Gs>U|sY7zuHa%Kn4CK}gEUYTs%yJ&3j z!|A}V#GD)o^cs6ATEc@oFhSP#A$%Zp_bKVNq`l?|?4<)>gTo_-hrn?Hxtkeq=Aeka zV&9SFwf>49+|5|ZEvwc)>*n0KaLKECqhqrtu!acd#K}f7je`1RMO$uYXLD`scjks< zVhSy`+!?sIu!zu|_R0#3PO$LVdg1}DqVdWYk>yu5BHLT8vu<1YVEN2fn$=~k>_Dl- zkBYD|>Y(Uub$0mDa9+Zd+izwHIIRVJl7Bla%Momb9^>uQwHuLI>P>RF$#V8|+nVy) zv4x#;ToxACQf-U=;)sE@`2EB;OwTmKp|tH-9t0$Nh8O!uITK+Yq&$+(8GR0;_+taLCU&q zreDtQ)zwZ*Y@#>dHX^}>lnj9nQcom+sKjN#*iz)O7d8R9vk)4B>{GdB}#AS4(n z0so^LyR>?wg(i-95K9AKPEjl2n#mM ziou8S2C%bwYb#xPuE&U8lyqZqIj%rJvG0mS#6Q!{ZH7jM1<93`p&rJT&Sx8gg5NeC z8CXA!JESUXD5g!!3s}0j8~LJ^y7;yIDx;tApeoy~Z@Q=T?}59dELYFGpNX8o`=G&Z ze@hYzIBFM!C&L-`zj$RX^rCr+M&5KB_)L0i#S_2|27I}DfH**gVOKPGmU*`SEF9g( z&_ti>vYW_D?VISr_xPT(eR~u5mwmBc$mJCs)%xPPOi5Mi_eTkpPg_05-w@B}NiGgI zFcIFL)eqEfc5rqKeaYKgWZ!K{9Kr6K3(m^#EYnxjmwgqt_2!yg>zkeO-t<3u8`t05 zcB?afZ}5HKXzmKIM_r$_sQq!IV^eGC`56<3rG{k~S-0&>&^=d=5U$r_5{G~V zEu%A3;(L4-(G7G5=k;a7PDXFr+PwZ*hmH^)I=2+{a)0eQ9OJTKUrdf{ez|AM-5(B^ zuomCA=5C3u^iLJXzewgY&K(=WSwwUc)@=09Y}Eg%{I+uk){8k{uM*!cUmF-@5Chqj hKXgBh!;MLEFaSQ@d8ap!yJYh3Eljjbc#@x#`(G4qB;f!6 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_gel_widget_icn.png b/res/drawable-xxhdpi/ic_gel_widget_icn.png new file mode 100644 index 0000000000000000000000000000000000000000..9342437061618b45ed153a56b8d09c73cfcff5e0 GIT binary patch literal 1910 zcmbVNYfuwc6ka018U{renc=&hEYU+g?M6f-GLKZIZ~E0rIKjh3-QQ7L2FFf$usao7ffBd$?x3#r2Yb>oxT zmiP=a&Q{?TQ#zrc?qlujaWIv;&l_?mQr?J`5PIrTuvFBfNjKm|Qh|z@)Co(g*NRXn zACbcxflLbX5CH@UI0CL*%8_#+u1pAXh2tEb!Y+XM2qyyOLISxEg5+EQPbxqcNu_+0 z%jd{=(s8W9XdyA91|PSpr|gbl;m=}4G6Kg)6A^DRrH)rXtjl z8yy>gjtlw_FNzcT^|*EsVKRWD85Ze3;Q_n=6$qpV1ao1|c;rGZ2SIr-jB+Dj<``D{ zf3n7=oMAi4<3HsxzD3obWBIZ8DdA)L;6|!v2&y@_r^1G*o-0$J5%ISB-A7%Qct*H4 z4QyucRAmeMrYSjrQ)L@~j!@{&Uj{Em{|&k{dPmUtt7+>v;H-7WY3(ZAyCvRx;u0&Z z7gLg}xXs~rPV`*wuBr*OJP0^ITu6;fgX~X1(o1w3SoJI`Z&!)zR?*V(iN2R#kCcCV zg#mWMd!IE;Ca1cyAvL`V8iLOssqAY{=yFjS=<1pN*)#4w58(yrzm5)Uc>m;h#>>nE zFVeL)eCml!O$FKcjK{mu{Z4jHSn07pbmyZN!inLom=;^m5aBILZ{ zDqMH}hS&7NuuFE_)|r(P3ZHDYcpB2HJA4JsTb9lnX!ihe#UT^ikBakKFSsA>?(8Ij z-U7m$mAS<)kQE+nBa&37eqK$B)q81z%f>~;)oQ2CEhE19d&_&~;MT$JZFGsho2GUd zzeRNX~vJLvo0o-@G7{rmM(B+k*tqw05>%Sm5(bk8!N z^I_*K411GCD7Lxe0ySwqdFPWRt$TPRX-6de?xm+uHILH|uHRVs+GF-)a9WGPH7c%S zeUh()X1%+6Mya1Y%0m*g+jCz-tBmc}bgzKMxs+1mR^8gyzk7GCW>VPwUpGy%3HA6@ znCupanNd`EthDZ&|9iEh==n>#Pf^@Z zQjPM!#hDs*;tyVhZ&FrI%N543Qif{{-+wi$6qql&`Z_YHvaf$%+PlIMph6ZLVXrv& z&7nUywbJssq=dojth#X0>VD?oloI7osE6nQ+zXwnxTmQr`0)Vx`&?koUMPPg!~gb^ zW5GGm69>C(t;#1+IRU4(Cen+SW-(%&P6bNn<-oM!L$vr$h(Qwm=qW8e&T;Ax@5Wj> h>_vX0^9o%(-5cNzv9StW$4SSZP$7>&E2XQy`v)F{+HU{= literal 0 HcmV?d00001 diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index e05adf2b90..e4f4c89602 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -26,6 +26,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/widget_button_text" + android:drawablePadding="4dp" + android:drawableTop="@drawable/ic_gel_widget_icn" android:textSize="18dp"/> diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 76d60a80b1..6cb6a5744e 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1931,7 +1931,8 @@ public class Workspace extends SmoothPagedView AlphaUpdateListener.updateVisibility(getPageIndicator()); } searchBar.setAlpha(finalSearchBarAlpha); - AlphaUpdateListener.updateVisibility(mLauncher.getSearchBar()); + AlphaUpdateListener.updateVisibility(searchBar); + updateCustomContentVisibility(); } if (finalSearchBarAlpha == 0) { mLauncher.setVoiceButtonProxyVisible(false); @@ -1998,10 +1999,27 @@ public class Workspace extends SmoothPagedView private void onTransitionPrepare() { mIsSwitchingState = true; updateChildrenLayersEnabled(false); - if (mState != Workspace.State.NORMAL) { - if (hasCustomContent()) { - mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE); - } + hideCustomContentIfNecessary(); + } + + void updateCustomContentVisibility() { + int visibility = mState == Workspace.State.NORMAL ? VISIBLE : INVISIBLE; + if (hasCustomContent()) { + mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(visibility); + } + } + + void showCustomContentIfNecessary() { + boolean show = mState == Workspace.State.NORMAL; + if (show && hasCustomContent()) { + mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(VISIBLE); + } + } + + void hideCustomContentIfNecessary() { + boolean hide = mState != Workspace.State.NORMAL; + if (hide && hasCustomContent()) { + mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE); } } @@ -2018,11 +2036,7 @@ public class Workspace extends SmoothPagedView cl.setShortcutAndWidgetAlpha(1f); } } - if (mState == Workspace.State.NORMAL) { - if (hasCustomContent()) { - mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(VISIBLE); - } - } + showCustomContentIfNecessary(); } @Override