From ed5d960ec1e052ad66551f53d4d67ee7efe0ff72 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 18 Oct 2016 15:55:22 +0100 Subject: [PATCH] Removing some bitmap drawables. Loading the edge drawables only when legacy DND is enabled Change-Id: I1c66d03146fb7fa7d61a4abf8c2e5a4289a117b9 --- res/drawable-hdpi/quantum_panel_bitmap.9.png | Bin 397 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 501 -> 0 bytes res/drawable-mdpi/quantum_panel_bitmap.9.png | Bin 286 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 333 -> 0 bytes res/drawable-v21/quantum_panel.xml | 22 ------------------ res/drawable-v21/quantum_panel_dark.xml | 22 ------------------ res/drawable-xhdpi/quantum_panel_bitmap.9.png | Bin 537 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 664 -> 0 bytes .../quantum_panel_bitmap.9.png | Bin 816 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 995 -> 0 bytes .../quantum_panel_bitmap.9.png | Bin 1104 -> 0 bytes .../quantum_panel_dark_bitmap.9.png | Bin 1347 -> 0 bytes res/drawable/quantum_panel.xml | 8 +++++-- res/drawable/quantum_panel_dark.xml | 8 +++++-- .../launcher3/dragndrop/DragLayer.java | 10 ++++---- 15 files changed, 18 insertions(+), 52 deletions(-) delete mode 100644 res/drawable-hdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-hdpi/quantum_panel_dark_bitmap.9.png delete mode 100644 res/drawable-mdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-mdpi/quantum_panel_dark_bitmap.9.png delete mode 100644 res/drawable-v21/quantum_panel.xml delete mode 100644 res/drawable-v21/quantum_panel_dark.xml delete mode 100644 res/drawable-xhdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png delete mode 100644 res/drawable-xxhdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-xxhdpi/quantum_panel_dark_bitmap.9.png delete mode 100644 res/drawable-xxxhdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable-hdpi/quantum_panel_bitmap.9.png b/res/drawable-hdpi/quantum_panel_bitmap.9.png deleted file mode 100644 index d2aee737f3118e79093479d4b3ff9d66fea1d086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmV;80doF{P)?bCO;jY+`2eQG*ff#Vtt~%(D_ITuv+sqoe#{L^R-xq_T#@ggGMWlm)|uV^hl-zF|4u z*&w>_;IaK1TidsY`BaAY?H`C-`}zIbYuWIQmIqDEQc!`-dC~H7gbE(lSCd)yV z#+Tk@ZTk`gL{KsXPy|7ijp%zegasf_z5pPJ+|OfQ3M3+gter(;J?JDX&)$B+@D$dL8myQP!23vTN%p#%K}dCiqkNp?p%l zDgR>Q28}2Fu@jxLn)se94YI$iw)8Z}VJH4ozT5JO!l`5%8)W=#lZ_N-V^LYMdD6}r rRUj%Gk#-p$fQT()=AVOMlDz%{31_#8WYvbC00000NkvXXu0mjfUR&_< diff --git a/res/drawable-mdpi/quantum_panel_bitmap.9.png b/res/drawable-mdpi/quantum_panel_bitmap.9.png deleted file mode 100644 index 9325d491f856917dc6e299be221c7820df70a010..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmV+(0pb3MP)*V{KT#_V73UJWzj1f+P|WY{WPcNj1fb~u)wJCdE{hjWbXmM9(1u2Yv7z@mm-$^6 z>BU5`Wyt^g)Nh8caXj*DJQCodkDp+EFT?-%AM@pS_?h^T;W#!7o$NjbpX@S(31d+7 zZFwh$PtoJUZI3<_gt4T9ITl$fx1P~jxkcvaKoXm!he>9c&uNxPdaw|mz|cY)?K!p4 kf^ZaDKmicJl@{r#G}7w8?hq?BBojp>Ox%?tSy*%5EHA z=AsR4X_IXyY*=7)@A5A9Xo#_}NOPfK%_U~}H zMyWmA9&Qh}hs!;TYx&{nG7o=fGj3R5YQ1prSgv7hX%i%HnCHRR?Alfl51z{~`aHL` zUDPJqxZq(I24D@&;F@kyx~4O>&_p}t42-}ctipOmt89$08G8;0^gti - - diff --git a/res/drawable-v21/quantum_panel_dark.xml b/res/drawable-v21/quantum_panel_dark.xml deleted file mode 100644 index 405ad51735..0000000000 --- a/res/drawable-v21/quantum_panel_dark.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - diff --git a/res/drawable-xhdpi/quantum_panel_bitmap.9.png b/res/drawable-xhdpi/quantum_panel_bitmap.9.png deleted file mode 100644 index b89e8b41031de46fa12bde72666f6db5941720bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)x0005tNklVtikOA-#=|VlA?+MXB0cI;HbW&M;`Q(g6w%_Yutl6(zyeS7qXSA~UN@WF)b4 zkqL45=et*(8|@KKRxF0QFOF`y(^ylJMpHf2v4k?2f4+Cy18O4nfvor}si~_^ z+7cyV3+V z41|i%M@rg!D4h!5Ae*RBv`XHA{UmNIq(k~PACU2Xc{E9o@q$p%jFfI{lXMurI1YXn zIgkT6kOMi8138cbDgR|-jnc8-Ri$;41{g}oL=3S0Dixc0M8QlwY8K(zW0PCwb(TWW z*;^M-th36*QBxnfdi?OK>-lV)etF~ckwaIhsZp%^Us1(kma&2rEMbX%poW)bGoJP-f4kAjX^i5DB&Gw1UxQ-R3d>n<_IX-M;eiU0FewpQa5XT-SMI=tY*B{r3V~q=8F$O5fBy~dP0!gC5Ty>Hf zmuqCrlhjD3vGMDwAp%^zW#`^vZ2S}=?h|mG<(TFp#P8Tx4inGf6%%F?kdb$C(J64>LoZg@}-68DN%; z4SNHC18QB}d`QGe$N#bQ;ER|ASZ^^ikn|zF1y6=W#7U<>gc);(kZ2LP+krs@k*q@9R`WCfbRfOzbeqjH0_5mP zYMjqtm=7-=U;Odu{XtjuFDHU+`ChL4`269}us4uC6*l^btior^XVPa{GT}2a=f%Mq zPAKG4$_w6kzn&rh0000p-CXLC-FyU8bW zgJhnQi)S9*Gs%jEkrj@D5!Ogm)yR=oOMb3}Qzl!@-NOUmC+SoRTJ#ix_vZcm zgjqOp05quPs@84uPM+57<|>w~90067R{GJx_QUz7in*u|gi*!Z`KQ{Cnu|ckA1jw< z1By9^^>l>#&{Jn0qCuz{fvQv+&$p^s2nIUPs(}s|Kv1)uZ-qugs;uc`C#(jAU@Uc% zu^@0)&!SRQ@sm$}F@%6nLS0n?T8g3mP2ewK-5{>(Ys%R zsz9=Kr76F=ihH|~GS&FEDW`IG5mFZZ zb*Un+KS1@j5yd}g0C12h_Me35zJ>(Vc@BmRoKwUN@az&Ks2A5ctnjR&1$do1m0)V| z>`5{>c~+Wnt*h2Xv0+>QINa`;&B2=FE?OPe5NA>7W?i$#qEVg|rZ)=yV5Reyg@ zlz>pGhD3Y+xCLL~f6EuUWZ@29DOZcT0U%}oN=lVf8QxA*l4((@mZ$-6BS5O9n^%&i zB>?a2=9Ifez6AI;fqx5h1o2P5ahh?eENWb;exicOa;nD3MyBe&2(YjyEJ^s9k*fZ+ uFKRnAWRehg*>V0000x- zeV=@TyBgKGaa}~Grn9B$E+R~+5`L*V61rTf1_BO$C&TcMYJv$2-GW|SGN~w32ZrI^ z3QRlXd1~;)&p}Y~{-!;$4Z~q%Vxk3ynC6nI;b}sdPKK#9*qvkfH#Lz|Y7cmNLKE2o zJD^m8M!~Gh9|Y@>lV_|QH*3L_oX?SP#diXcZCU=VEeDkuHD%V439}d8?%lUvgE3}A zj?PhmqkR|OY5eSkck+%)Q7qd*MP(LCq*tFl`?N8GwALy@yx;+O$Gxx}G`$5dT&Zf~ zX3pPcj2Y_xasLxG%T$`CG2pxSPKDT^zN_!dIjP!1#nx)Ib;ZwH=NgG6*ay2(7i~SL zG=9d@UK=w-)stnJiY?g5cO|z0DpR+4`GeRVS~sFRu}15H|JN0LDK2%4ad*eG32N=h4`lm^9uqsZ|G&zQY z#jvNsUj)x@pFcKKVxRS0KYiSfUC~Rs4=Uu{^T&6swKrln>O1nUb&2OJQz5z190mr1`XAtZ8`1-~D2iGp_ynFHV%ADmvbLq_5hu1Fb$~)b| z>7-NH0Tb@BJ6MVIL})H+ku)&M-ybFvXp>Zo1)&K{>F=Chb$0HeqwP_ zEsEupTJi+|3Jw+!2@sjwlUjbwqGW+#DWs!flgc1B7#L(SNR{v}|4Pw@`~#^@!n(6u Ry$t{W002ovPDHLkV1k8)*r@;j diff --git a/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png b/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png deleted file mode 100644 index 915177d78d0c37fcd08844bec4425d3ce08314e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1104 zcmV-W1h4yvP)r`%=65|>)=8S2K4=Bf+41oC$2Kqy$Pb4ssmBWz8IDqbfWESx&+BmR> zriM=sGZqMxz4vf(@ObljHAVq_oN^{niDHq;M+O5e&%+@yAy4^8)Ef@$^8A%6k^l>T zCA-8>pmce?6BWax_lb3hvLD#jIdS;zBty0r<<$_-Q332lnuEP}@n6r>-?YD^PyNkb z&%AfB0r%j{ARlOH;K^Hd{`>hu=e9jX?m&`6;z+r}wx=9A_xFpB>~5+*H^H{g$0w9;y#JMbTuGDDIms_7@qBV!!*Q^=`D)#=OvD_bs2Z^_k{5 zYegl>3{r^}t9a(}Iqpsj19smbr~|Je30^C57_BAB1FzBoTd|CLFRFyx`ULZAH6o|c zU=2?&RffLM%Pwy z$Up`%kbw+jAOji5Kn609fed6I0~yFb1~PCH041*=1G60rq=_)lW?Ml9Qtqc`OwB6) z-4{g+1kyw{8QRDmB&u?@wSW1nJ|NjgNclz1z?H9TrJka91%VVlY{?n;(dN}YKV3NQhR;e}rvMVy;8RrpvqsRD<&lrvb@}@$0wP-~1=m*C>wfChvoxkI`X|v14`&@DCQ;)na zno(*O_n$cfaB}fe->Op;=#l1|B_pDW7MO6B>P87^vd1n(@WK0)rbSiULec)2x zt|W<>xkN2Groz}RiuKb(tR9k%2Nr@AM6D4k2&P&7dL32bs&9u)>C6snZMG3;@uw(O zuvtTvI{%p4fn#Sb4Gy(MzZdme4NgsSYpw}`neF^udx-&(-%af#iS{3^e)pt!pe1(S zPtN-;S!TW0dsj6F~A-qrB65xz?ebl!@o^L0x9$S&-fR8 W;nMm9K3fL>0000rWn3e51`@;7FtsTHwPkg2olBN(BYD}ji@_9*h_Nw*V0$Xoj@QEXp#T}2m+C;0u|(q>XrV|`~|%%p~o=-6P`#| zltN-Q-w~>_9-+bnW=o(XjnEW{7L`DP{fd{D;VcwBPJ>`SbwCMZ0*m}Fh%98koGfcd z0S^$Fz*Lw(LV*-WD3DMfp+E{G6i6tLP#^^o3M3Rr@(UysNGOm32?Y`gBos)2gaQc# z5(=b1LV<(=2?bIhp+G``gaRp$P#~c|LV*-WD3DMf1*#AxkWe6@Knje(Bp1Y1asmkj zQlRCCJIUW?$K&48m6%(g<(ElPd+Rdncr4RG_M`^EMMl}M%==X`6~w$>)7H~|7l{cB zcT|<-yD}A|s>%JaFI{ zAyL#lt9#csLURhl6#9ep?=Rm!QI+K34U68>Y~ zA>*M>Ra0e`xCn__M2J&7_608{{8(j^~Ai_iP#&reqnl=7xw2*jEqJ#g$*FfNK#P#>83 - + diff --git a/res/drawable/quantum_panel_dark.xml b/res/drawable/quantum_panel_dark.xml index 6642e78ac7..b113b376f8 100644 --- a/res/drawable/quantum_panel_dark.xml +++ b/res/drawable/quantum_panel_dark.xml @@ -14,5 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 019a1745c5..59d18c23ab 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -145,10 +145,12 @@ public class DragLayer extends InsettableFrameLayout { setChildrenDrawingOrderEnabled(true); final Resources res = getResources(); - mLeftHoverDrawable = res.getDrawable(R.drawable.page_hover_left); - mRightHoverDrawable = res.getDrawable(R.drawable.page_hover_right); - mLeftHoverDrawableActive = res.getDrawable(R.drawable.page_hover_left_active); - mRightHoverDrawableActive = res.getDrawable(R.drawable.page_hover_right_active); + if (FeatureFlags.LAUNCHER3_LEGACY_WORKSPACE_DND) { + mLeftHoverDrawable = res.getDrawable(R.drawable.page_hover_left); + mRightHoverDrawable = res.getDrawable(R.drawable.page_hover_right); + mLeftHoverDrawableActive = res.getDrawable(R.drawable.page_hover_left_active); + mRightHoverDrawableActive = res.getDrawable(R.drawable.page_hover_right_active); + } mIsRtl = Utilities.isRtl(res); mFocusIndicatorHelper = new ViewGroupFocusHelper(this); }