From 36b54228fcb9599be91119e671cb0a4c6064e033 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 10 Jul 2018 13:50:50 -0700 Subject: [PATCH] Retiring some feature flags Change-Id: I80a00ecaec0785ce2ba6a5f14a54c8a76f555d43 --- res/drawable-hdpi/ic_allapps.png | Bin 2956 -> 0 bytes res/drawable-hdpi/ic_allapps_pressed.png | Bin 3231 -> 0 bytes res/drawable-mdpi/ic_allapps.png | Bin 1488 -> 0 bytes res/drawable-mdpi/ic_allapps_pressed.png | Bin 1997 -> 0 bytes res/drawable-xhdpi/ic_allapps.png | Bin 3598 -> 0 bytes res/drawable-xhdpi/ic_allapps_pressed.png | Bin 3961 -> 0 bytes res/drawable-xxhdpi/ic_allapps.png | Bin 6398 -> 0 bytes res/drawable-xxhdpi/ic_allapps_pressed.png | Bin 7039 -> 0 bytes res/drawable/all_apps_button_icon.xml | 21 -------- res/layout/all_apps_button.xml | 17 ------- res/values-sw720dp/dimens.xml | 1 - res/values/dimens.xml | 1 - res/xml/dw_phone_hotseat.xml | 11 +++- res/xml/dw_tablet_hotseat.xml | 10 +++- .../android/launcher3/AutoInstallsLayout.java | 13 +++-- src/com/android/launcher3/Hotseat.java | 47 ------------------ .../launcher3/InvariantDeviceProfile.java | 12 ----- src/com/android/launcher3/Workspace.java | 18 +------ .../android/launcher3/config/BaseFlags.java | 4 -- .../android/launcher3/dragndrop/DragView.java | 8 ++- .../model/GridSizeMigrationTask.java | 8 +-- .../android/launcher3/model/LoaderCursor.java | 10 ---- .../launcher3/provider/ImportDataTask.java | 3 -- .../android/launcher3/util/FocusLogic.java | 29 +---------- .../views/RecyclerViewFastScroller.java | 3 +- .../model/GridSizeMigrationTaskTest.java | 19 ++----- .../launcher3/ui/AbstractLauncherUiTest.java | 21 +++----- 27 files changed, 41 insertions(+), 215 deletions(-) delete mode 100644 res/drawable-hdpi/ic_allapps.png delete mode 100644 res/drawable-hdpi/ic_allapps_pressed.png delete mode 100644 res/drawable-mdpi/ic_allapps.png delete mode 100644 res/drawable-mdpi/ic_allapps_pressed.png delete mode 100644 res/drawable-xhdpi/ic_allapps.png delete mode 100644 res/drawable-xhdpi/ic_allapps_pressed.png delete mode 100644 res/drawable-xxhdpi/ic_allapps.png delete mode 100644 res/drawable-xxhdpi/ic_allapps_pressed.png delete mode 100644 res/drawable/all_apps_button_icon.xml delete mode 100644 res/layout/all_apps_button.xml diff --git a/res/drawable-hdpi/ic_allapps.png b/res/drawable-hdpi/ic_allapps.png deleted file mode 100644 index 253755ffe22319920c545a85c67a7722fa1b0ccb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2956 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 RrnmqA002ovPDHLkV1f>B659X( diff --git a/res/drawable-mdpi/ic_allapps.png b/res/drawable-mdpi/ic_allapps.png deleted file mode 100644 index 6936b2079195461405640261db66eaf7a1c153c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1488 zcmV;>1uy!EP)|(Z+BoX|SEETp%E98zeQUn(Qi4;5174kM|sesVZ zl&qs&WDsyFncEi~ReDtE_C+h10S@URucJ)~LO};Ioqj9ewevlajMz_b3e34*NQW9{n-z{GXpK? zPziaZ0qHEaB>Cxuubih@STB?CxbL~|v!C9F=3!U&*iZJVsyR194rGDn<#FU!28U!AdLAjZ}-I} zz+m}hF;{YJWRT=Bs>VmA1#f($TJji>w!usOMTlW?sneO`}^$gn`z~xrT5a!W5!w@IY2@M zU}+_n&F%k`_p`K9BSHI_K~Ig$V%I)7TXOsQkRi9PZ%gKq*}VK#q~@|Ms|3sxpl2-w z&VQ!r+?Bfv8^g5B4Aa8K%3a_3Qng#NAda_8ut2;ui+7{!US9t(UichXN1K44B9s4KH-U1x^r=mR&Oj{3pk?-?-K-xO)ulMpd=6`b>kFKXL1=16AGw5OSwY_&4 z2))W=Zs*m@cg3?&kRY9n;xp#W?)CI6rYC@~=(_O{h_Kks=-hdUxRPxt3EK_>-U)G~Q`+f=t1mbsBw2qe_7=1%K8P zh=|k`je$<1E1F1%>-7C}IE9$1+n5Y@8on&jk{}MF(6faCS0*y|dm-&K_p-Dr6M1w! z+a=)W*SeG%?=)2N1!Sieg_N>EHwVT#4V&GR z4UkymK*USHp)YkwHP&g^*bjfjBL|{CfmE_c=1DFYf=EA(E#AnlA207Bs za9UY9kF*CFAme#Z(!>Olbqen}c|FXq{$ia1Q zQts1cP>U~Kol zen&eiU43(YI%lPCMvKYT|3$cGeLzuU0SLfAHRFG$L*lshma$&!RP9KhAn##k41lDv^V@IO%3J6#dY* z?^nluA6TWA@mgz~z=gD251MhTBR5R(4dF(J<-1H*-x_xIgTVENH(*d z?%Td6`jBqWU8C(~V^j3nvr`&jLBsfELG#y@?uvE0F7-2qrjEd;G(o5*Avgo%jQ7MUg6ptVpfjk?lCz0UmSllgyu4T*`%hV1{*%zd%0 zDJOiH>UeIJXEi0o0o$=k0C4<-@8TkYXZ2UJ>iCzG5?C%_9b2I-WR6+35OTcV?}{P`CSl|SFnD8V+EDC~P~<>~oFa5*!= zsMx5ZHFP zoW&Ask@tE0WGjQthsml~dxLt`!Hr!Qqa1yYK zwlH$E8A(8)*i*UhME@W6o%B?yktZV2q6Ys7|A|EnL;%R`N(9PcMpz+Di#Qwk0};Gi2T2@>QMxO`4Ez)yk^Is@GRN6>zm&*|oqJ0P~6UP&QXW0ux zZv6ue&`FvcEgd;d()eRZGiCmigWdjk(zsj+K@SXfjm#P*Bqa?q@UJ!o#F&yM*dH8I z(g;RR+ih?X@S+X zQ?6GGAs)><#VtRq+|3GNl9EP|Xnp3}`u|f+xlk(i-lBP_7xa6sH7&p{_-| z+M08pZYDrsB2t7;Us-d`t6hr-g;9WDCCtl#lJu&kOK(WY);OnRwxqoDM%CVu^veNZ zDg`719il?i7tGh^ZSFd(YixtZfwOh3>+rnI`MNKNs8Zn3fq){*3uR`O3H;S#}OB?^sSpLk^8D-UaivH_woz!a1w?eOW%OB#x` zo8fSPqV65Jfea8^DvIeDji1ozd9$-i35ubJFdCLw0g|NX|D<8nPmj$=>kmePahw8D z0o_oxIlzS(ExkLAe*J2ZH$7hxh!qr=5GOM!)YmLUnJCS;zsM_# zk&kQ`~b diff --git a/res/drawable-xhdpi/ic_allapps.png b/res/drawable-xhdpi/ic_allapps.png deleted file mode 100644 index c11c1038b99612ef955316a8d8fc27a07d5c45cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3598 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 UMX(^4xBvhE07*qoM6N<$g2Ms9L;wH) diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png deleted file mode 100644 index f319bf1e6d77309b67183c84c8ba9bf5d0840665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3961 zcmV-<4~FoGP)TCeq5FB-*PN7i*f%6=vQGU(?3 zQ`Rj&`YN2Fa>U?}3sArW@u4M&J{b8Lq?9@!y(N7fPXgtJ+!9JxBRSe zt6G#RrJ&$4A}wX#tJpWz>P1{QP+%~qB;m-d@%E4HSAnQv1w@Z(oxMl<@0VWGb$|So zo_7-+y`8=B)vGhn(erNnm9G1jUex~k*?Sz-iYTBM(fum+kJWhO788<+G;c&SL2c{I zv*~n~>|1yKj;*`LCOO-4BZ$7?(EQ44VwdZ;lk*n8cKn+!bk|cPGKt^S3ycV)7;{NO zha(c+l*hXBe5Adyr>1OlXzT#BF;N!D!UEtmxq$5J9K0-I<|m(TfBfJ%=drSv9oBsKp>;oXCKC%FIV{53CCH)@0b=#s?z=936iXk8Zmd4_ z7h4jMp&-%_;2_L2-AxIS`?dV(mo>jr;~@fA5EzBaLcj!&Ss1_Z+S{;XW-Lno@U4&) zKp-OpNC3cWX;W3_&hGzy`FXz>bF>-<5eqwZ(gT=Vp zZ8xL&H#a4=R^uGYOdwG46U^al+^o4CftsPmSZqs0JVjD#2vQ*%`3EoEfvCT@^ou>qOM(#Gy`d!YN!-Q_~WO5~@^9yv%?8`YhfkC_sGv`el9-S1LUH1D;( zE2fXRBoA|Qc?TX>c|p>EbKk}r`WSi?Sg#c2>ZBXs)zLfl6zX{I=-jb033l7|B z=H9WFd>9Di+ayRt_4KNsvh55aSd@}1QQH})d{ycx$gprg0)(cx2PD7vxi@umwr9vT zo%+Sk=O?GQLICJn01}N;&zf!8>JJZmB_;;y55IBjvu3;^Djbji;!WLsQ-A)sv!NIe zN=+oj+3=4)>qu?t5(A(@0cjk+pvSe={wn7x!3=ADeOl{GJ&r+z0TRHpjq`7*6An=u ziOnNF5i1rlf-Zo>IvbvN$Y-f-9UgQJ9elH>mY;@H-u**_OCZEdfIut=R8&`p8h=!M zCu}`;38bI|w{RpicZxGz!ZxT7m@_N7W_8cWtO$N@#di%N7C6)9PC;r52LR;@NPx#N z1v~a2BIpo2GRZeC-t*wGe`x#t9tXW~u}Km^itidknrMTAV57=o0F*Bv)$>fVdt>?j z;g>nVv&Zjx^=GRTG3NK~diAr%3qZr-8YG~y{r4F2f~jXvzJLN6uaG%=J7<%%{{mtd zOCJ6HGtCVK(4>vDG<^S=C66-16x%h3NZ@R8?heRIR3Jz`fCOS{QU~eryA#2z4UpL4 ztr<`$Kc$UtR)0?VP;bq!ATG9R5D_%d*gY2NF)CLmh9-z=dQG0Fte6~ndXo6>ECXjW zGz<)MT7%zSCO!yKWY^$`D4#UG@)fDh|B$KVmFABP-VPxrC;{YdQUTu)7-(o1SKx12 zK`sCq2G<}2k?sG`&|@k&??a}MVGiDy>kuZxn6wL$b?gWU#F08ia?&mgnBuzzlYr|E z-2|pFPe20IE9eb2BZdt-!vtf0eAV^~me%k%9?!M3VChxcjs39zTvS&`r$W5J=I|R- zelti6MUaY(2(WovmMVXG{X=`NNTgS!R&@40wAW8>a4N-uitid!mQX$sU}AvsxT?jd z9f)~t0uaK)BHp-vzIVkx`riSUZ4;YLjtID@t}v0nYeTFZG3v{svQRZ{!ZU8yUlAZC``b}Pb>%Ito9KO! zaR>lG*1koF0Zj0?s-T)ljj(IYP^wk~f&t3&E?TW9igiiRDh0~_vW+N{Cs=nxUL^l_ z69SMWfUvGef>=lp4j8~upNNljMg;Nu1SEN0wgu?1l0vvfsFMkoq~aD33GZYG&;Tva zrpIlAfJ(iS0U#jLvp|D%HqNyrD1ZUeB45Xmk8(Xq_dmL4=X#VPyTYa8i+m;%5QJ?} zAFYg3W+~;&p`FY{dmYsFhqmACdC(gd1wBepU11VJW+_sw>?2Sp;21)>e=#8Wbdz{) zb&v9CLNW7aiCwRLF6dE;=?aku(7y!fF_a&mh-d+IFAxv|Kv*a9y=R&mvpou$$9yl> zqZHjWh=>L8g&-p$ki3fDxWM~#{x%j2$*Yseq%;g*REh?Al$Jw@i|-ml0=Dw;XK+{M zUHr-_1LvW3y^_|2P6h1(7WPIKuW%o5dd9pAu*9MxfjA_(2DJ`aNnG@p^(a>lX>z#=Qh-o3(!B%qf82V zl%l%^5h*Kg&w{(kiiOQ@1_4>A;hyn9x}5-9(w&SYq`x@rUAWyE0^~V^khGn^?JGK8 zVTk0_$viao+0kmSyptg)IEXZrEwgv-e%J$` z67OW>ksti*)h1rnk2Ew4Bpi_8!1JP+D7@wORZg<`R8IyWJxY;Xfh==kUgHmu@lu%- zGSIO395Mod&6siMNPPU*q)DaS$$atz65}Er1{MOz`;dW!?eq~j^7+(4VhBo6LY(S2 z{&_??eOTCn4jBkcO1G)km(IVR0E<$TCCtD7?~B`1Dww@s<)5I~?hL$RA5L|Uf|Ou> zD%El9Lx^NNdn@%n_phi!bu;&1m+DW0Bo>2GZfwZ;Z<)j z!=jXAnS0*a{Sk_EreU)Sg&Z<~z(8wLFX)|dsSyxLNn~Z_rRc2}Z7{F|$Uni{6v9Av zWolzTeYN8@CNU@xiBZ&X`%ho3jdW$8p$D75kOTun(S2z|zJFEXeWk>f1fErD)%)MS z5|O@)XqW)6@B{@CWSG&lcrSk6X?`y=Wc2x%{l5E7dpBN-j79(`kdOoiox*{oSEd^x z|2=Q^IY21@0<+Kl?|BW8m1$_?Ca_RI%1xn#hUrSzRqX%3{2LX+U^HbE&%bg12kI)i z(lF4lxh+bCCkRM@2VeZ2bX9cQi#r}uO3Wx8E~?|PZ7;5h_N2v!pG6d)&;$eJrf^^x zKcii>I-`Ur#!-uB?s&4RGTQji`04}#C=^g~kOq3-Bb9b+((ZNi;u&8e%E;1v zi8o`fqm$OLsbKmvOb$+l_SS@gr6uYl?5#7tw?XX|))Ik649_~M(>MUZ$ zH?_`==e=@@O)4Jtttw&^+vF>!?09ai|QeA$4g-|h@1#yk(S!Brx(q5c8_TN)~u{0 zL9rpNh+>$}?mpzWdl%M~$I~X*n11;56$(g@HUFy=p`@ww;`;Izo8R7Old>j)6%tSp z;Ye}M`*$Dr?{_8Psh+eL_+P`bkYW}*^#8NWSa3!3vG%*3+NrZ?Gp~wZ1w-DhVj+r{ zQ%h%Ew*T1=eO_IjHvJixTzV#phvEVTlCL8g$=Iq$T5g^9^0V9Z)Qpc*69i%jpl_9% zB~qj~xw=L8$rNFa%M6v=vlGJ5o3O=3_ zA|^;P6jcDRutda)MOM8x_xc~5cizj(O?9MSC;b2}SUJ351O#Nw&sI{#rK;HfB=3CV z%4ce4*Y-whoN7lAgFs?oAhhO&5{Ot>fS8B}(2(rtcD-Na6`3JIObPFgNC4GW#UI06C;4`AS@00^AJ3>Jfws!&RG8)R79@||mb zIAN;|o5xqSM8~+*PNj;F3y5#hI^p-EIulElF8rYVz6Gzxxz9TA>Xb3P#ux}}kXH`P zhP-nx8X&TO1j-=>cmXnli5-eLQI5-(Iry-MB2wcvI%OPTAZ`2Yavk@PMhXmfAp06h z*`(GY7Qr&eBIfWUB=?n#D|oAVtsDU8a~5xR&^miS#`|W} zRULODTbtQT+xiB$tqzOJW*s|MjYmf$REy(0G%nxBmxsGpupD*VoiR90#?Bf(*$eQ( z+a8E8^=$4cfFSgYyzQb1N7XMp6Z000=pNklKI-w_0zNHGSaB$D{enSlr5;0?a>-FNTITo@%vlqgZ6 zM2Qk5N|Y#3Vkc-qo}H8g9ltY@lA!#Ed83AcAl9a7xy-pbDk-rl-aE=O1 zr>$n4>C^%U#L5ato_8mcp!q^tPZFTmK{>Z^je5p|3j;pC@!jzmb=A$Wnc?Z&tZG%9 zYN!H?G5~29Nl8NY>3*{%yD7P0V9UmBzwP@`Hw+ljQ$h*7*$f*W+5o!{c2WqMOEU}s zg8*k03UogSLYEmUPI9)Y$;rqf%Q{NoG1y}F~zg>EfBnA^QAhD5|VRQ8NhX^-S`f?X6vd9GS!kV5&N z=gv5}_QRp$QD)UL&|v$QZwo7ufdbplNP92#FWva;X)7^|ilca?c8wO;Wlw}Zjq~Sn zPR=Orr@FAsVEC+t|5#Y{p6I`DjbH?0|0*~Fv7>=t67H`Ce{;hx(ECVv9XDZ(cFmp= zmBuxnQ!dO8a^mWRH298|vp!XRrkY0(SVxX6BaS5q^orp}AH3)4PM8zQ`t+MViR5{8 zd?cmumlGVKLqp55$o}lmV-{6@o~985@S(;nJ_H&LK_FX)e)7sgA6Sm?QQ_sDCosV! z-CKg@qy#CU8gAwP6%0Q%_oVYG&ryxGRwNL{7dr|;cMskF+>bxL66N!#()`Hvp&Yb}dmrAHzHlUJ$k zlY)|6832(IIwaJd0p9rFjGNUV1o6RO?0F0fIRgF0#;?v_3OXdx?v1!qfU&PoX&mGv zVxbu-tGbfEntRj@6`!&v&e(g{@l*FKTe5IvQ!K1EY7#M!v6hs^Jk*Jl;F$0$KJ@xe z#J}py5CZ~X?;{Xme`DXxvmS;z#(5=65DgjI(5EpDbq0eD3Ad-d(|qPlloRJLa!Ffd~o`l@I#$-Xj(6u3b(IV)5DbL^>imwf;N*>~i$XK4tL zqvxHvsQoMJ_KSv*0_C0*aNHv7Z!(AoJm1;iKTvnx!_jw&hJ%TOBRcxd^B#VnZi7GH0n>=2 z#rTwqnms`z+~~aFUsLtIyTd1mfx<*Xi3y+dzPqofdc$vYgo$$Ba8Emwz``?}n7J`> z(_PU8@WGgfF#PC(o9?N~HQTe>;2A&|x7V zV$k?GlyVoEb3?t}(z&f)5P@K_AtJ3`SUR`Yn;Y8UVwA=!RpMfb-aihaVC@{+N5ouqf~-1tQV2qrTE#4o&eZql3YSTV;id%TmVbWu-nm+r*wv1E~S*6A*k6dX6L3oyCVdK|o-jl?Sk-vF1z?n4+3sCGc^h@Sh(=X zpls@mwo~`%{RsJuiLvL%(qc5eC7)i$46+dye~JxIqN8dv|s}_Wf@xSq*{%fyR?J zJb2NS4IdW+4nAU`9_5-Nj;~psAjR6`GD}feo@uQl%IZH7prAKIUeBZFz4vjJIkCo2 zJvW8t#7N%z_+#h$J-hXc5O>@?>)It7XU5vf>Q#f&RyHHHWaF%BJMJci1Rt^R0>A#l ziSo6=MHlvB4NjE=^PTCD6C^;tr+Ba5a{dc*swA^E)jixh+%>#5h0L6)^Pc;kTg2Oq zoHV@r-Ah1qyfL*o)tl=1`*u^RjzRBQGQ6A!5`4shV4=tf-)e=av}%ALfdtL9gSDs@ zz2G#8qEHNTYWby)wN!Sd(k?QvYufEhwZtxaEVY~&W>-n&x;`{KD7<1bHk z|8^Hem?3soKeapp&LBG?W)}99GZ8$s++9Nq6MV#iFogL3+w6z)#SG+70)XlKmcG0t za&VwJPBykjIFp4B4?gtBGV-qGvUUwBiOz;s4 zCH#)d+TPUDt)#&mO19>r8EP=|uScksASJz+R5D{kL&NOwTVMk%I%86UVz3KjxHBD* z?MDKDJuV`hX&DYaVvzD)H7z=PC^JJ@F$EMn%cFrm;x!%2mC%I?O59Wv@k2s_JV-(k z@tbRi@ed#ZoY%qdlP5@6(*B_lCk7A&AF<%lsj_k2DzAZyyE(!jAV#a?$w=6$=!)(jJB zJ>%3~FU(+K*yD)7Vea+be_E&&1{{3E0%1X9|1%rg{Wu3qO1YV$l2|XS3(o>TL6TBv z-t`x(OdPFh6f0s7F{>JNw0bjf-36g}yG#)Tv|V-c^i}CuAz@Y^B38n)LaWk?+uE)I zK*2{05cCMmeor0iO3G!ILN7fn6=d}ExM~U15=Ib`#w%Z6gS!ul#kfI5kj7R?m|tvr z{nL$CkjQR?ab{ojoyt#Lzpc8mTxwy^50};_zgBnNcbwTGpx`40aHy!JmblU7PVhOD zzyNWEfchqK5cmcdSMB%hy04sFk@VK2Rt&C7CB1VhHh+1)Z*%o-zZ}6t-+lhl*G?pV zOL|3eWwJXB|Fsj(e=_0~;JwKC^m3=zZ*n0T(-Bkf5)bj&K4D z9q6ZtG_t4=JE64N^dEJX6!lm21!Q3^W7+ z3E)tow7`ipqc{kFh=JHW1{LyqHxVlbfx*R(7>sZ;oMAs4=zb{exUFQaL-7z4g27`y zVh~haB@a>FRiqSrvP3|=;u-*isSE*JQ?CFj?jaokh%2W?Fx3$_wQ&VdQQ<@Y5CzIn z0#p_SP~<~8A&??cC;=#kKvLBGP!NDHQ=~M90u&9gm4S-Npi+RCC3v?=j*t=K+P$fZ z0LINoZZD`q1<(Q?B>>--oS4A`6#(QyTtW$PU3&#qOqK_vU+V<&m?GVGc@T7>Uqb{y zae~rT6HL%a(0!MOPHZ(GL6B>C0p)Jd3~AkG-wTQWjxx|m<8xS5DCmN^@3gOzAdV?V zAO>9Qhyf6g-#4TI$t5KTK+5*_fWU;-y4fdK>|fpl~m4T5EAb>CUYn655J zNCW^(V246dAhn^->m-Jms@-=m#D3SN1gYV`g}uEa4RMXAU-xA<*!QMl_Z=WWcKvU* ziE<4jR|5rdXu`~Ke&3T>M-VeLyYKAztoc><9H-wDbLnXypkbMbm^=8EfEbvP-FF}s z47^q4&cv{QATY(;9Fc@hhS#msLr{<@*?lKaI<@i5!Ei!Df;-gC6p+ojB68pBx{Cmr zlHGSg&|P=G9*uNZL4($zHeh;9t9qz&cm*(JyYG;G^Wlyes@IGvQsn(mn5uC08+&NCENy$s*DUdH}8MlpE-&`5rRpsxx)6s(P%GR(jfWzr}z5? zSM8>V5s>@aAMezCH!$?~?z_9A?}31d9I*h5`}Nbly1LRI%Gf3x6HHJVSsBU+`C*iG z-yb_QKvSa-nW4lT*M0YaL3q$m2%S^)wTo-6;mUt@Ef3DTwEp@9uO+hZ0XWs+KOQ-2 zN#uAKaPScezj#hQ(|9)0DyzNiHHQQjl%P1&5bZb5eg5EEOt7EM5@6P*@_XUz`@6*u z8{aFS`!48+yFs)1-|J5PaW(h4#)F0g7Zk7=5^Ddl)&3nvp7#`20iY?=eJ6k!{LzQ5 zd2N4Zb$WYkD*-}2Kj>qjva(wBhwsHdtbKA21VPYVID;L#?}CpQ0P&U6w{*e9{W_ga z<^n#Tpt)0FgpMfxYw9nbJ?c)VDb(~J0Q9n}PQB}hioXuSgMo~!#k30A578U4(<*-W zo6K4!2&M|clv(@Z-%P96kcGBNSc2D~qXJ5wUy1v=w=5NaF;!qe&(H7aj-k(ol5Q^=x#eL$fhmMP@T~` zG-T}Btz~pEx>}_tDdFIGATtB zpSfr0Ilr9lxT9C^rVvTF;9g5T4?QtgwfA~md1Z~WJ-O~f8ND<^<}Azwgp((wDT zVf_Cs58mkY6HO9H4UyOX;0-_N2%|3xABE+23kQ%>prPSyOxJ`ifBDrfPMRX0K(BuB z@|SDF8`JQh^PeA$qeJa#$WOYh;RTPa`4-d2;1d~vW?J*j1&_6c2VL@Qum^CcLg5hX zL@gxL;QZ)?vs$YT5t+bF6$q=&M^5}w9R{))&-&BK893w%E}%5Lq0Er)>vM1F`#m$v z1WrcW_xp2i^7W8Elz|7GUn~U{wD2OI{6t2}3&Uq$k$7&x=6k~`@!Z*0yfCaKks-hE zV!n7mWqVDk$xFEn_;X_MrGu|9Lr=iUlLuc}eCeMP4M@4<$&NQe0-z8Sg4kE2q$c!2 zYTfS_99%X_GrK0Qtm*yA#(0ZSAJ&8 zy*Bg(`wB7|>Rax;@-yeY)DRg+r(AgA!$9YMpWqP20@~g{&TtSysI{y^K!5q@A=gD) zi~)i6kqbQ%2h;!Pd!7G3cUE%?c(2M<}w^bXgdg3tKH$!D%wlI>6qk?6fp zAdzyi9jlg{a^@MosNg#E4pU~NO!5kSqFMZD{Wd>szaN+??3DRX^vMhBUHIP zxM=)mOn`{l>)m|+H^2DFUu-pT%4Cxn*!xK%OK>p*hkWo9#o*D z?JOrwFp%+_07Nu741wRb`N2n)e(4Q34Qi`vG`u`9gUDHY$Opg5w<#)PGCirdv_`(P zV%{wmE?j;4@LPa#Fh2MB1sbFrVEC=ow_mt$-Ys8R(HeC2wt-P4{QH;#qZmD5s9F}3}m$r z4?3?z0%RP&_&AD6R@9NqPfDqHxCaG?D5%Z)w3AaAPQ1yX%X6LfNexQc8$=#e< zw{6v1Z~b7!Gh3jbfGR}Hpr7&K!$9XbQ$P@4pB6Mg_>&b?kz(a=r4w~J%t*p0J8s%3 zH3!zVG&i@!TFM$i)lRL7aRpdK0qw$=lur8n-axu1*|}wN=a#qnpGmy56={SKX=T?R z@_l2pXlN^@1PJp9AZUL0@8DMJSgLfYoeDL8?olZS4jibcs^T(^G9gSrRs^m|n?d7_ z2C@$ULp7>ur1XG4pGblRFRB0r*=c}4c8`gOK$J^N1mpr&1R^4%9<*C%h}}c* z!f2ujiu??2CEY<_yTGph@JBxR0@}U&N&r(y(46lmPgvxy|DbG={54NV$$5G52^#!N zC~q%c&>XUJWtF2OXz()6Z000|CNkl`Ezs})(2rI-$^fWqwDyD%MN;Mso&b8-~s9AlV|e0*VMJigGoGX@Jqx4J)9chz(krWwUF(@ZnXG}BBo%{0?Y zGYxH#y_0D{H(rlqTF`gz2|0)@hTie>eeuMp4rlOz( z`y6$r(LDo=_QTQQLV!_sK&FJCV~e=qPXq>on1lc#2w7Ja0Yo4q#=t;E2|0$ilUPuK zfItwiowfvk?eCDF6elT(9IcZc43G9lf(2BDI#g3k1~4FfW^hDEvtCw$0og@CCZV9C z{E#-h6K1NpT+1uvg#aN!5IlHLDW0wBI6+Kt0+r{6CdQH1o zr3Da(l@*XtzB_pY9VH~d00>a*p^Te3rG6J62LnF7{-EkvHIGo^ zIDjmSWK5q~Ytp*AuyU}Ye|6{D$JX7l1_q4Shx|U>Wrj@%ZGbU^ofLx7`X@ucAOKvA zIV#QV1_lM_vt}-8t=lHPjsJe0qvp`N#FdfX>o?7t!Ry)OJ{1$GcN}KTrGzc_07Z?@41p);d zuB6|r4qhI7>Q9e-;jQi*bW_>3yd+p{NJOlM%BJyD+9a`@U@t{6Zc#57WKi}@%j^ZI zPx*TyZq+i-VEdQj!ir>|!1g<`!Jqr?>iENlU&b)Xcj1?H&S-(XHpTR(jr_elB4>=> zr@FD$VECxIuOFT`IQ9{)wBs`NuiO!cwFZLe%Re~q==l$#=T~Jl+<-T9&TJ}CX`{w- z8ky$vy=wKREcnWqM=mP+yxN8!upT+F2n-ZKpqFQE`_1CBR>ABQU#DLQNkm|;jkl)K z#+MW9)As%g1?2DBVYeeIj-^_H03j3z8wY`gM-WKw&<~&c^~e5(=q{1J2Z6x2OZr|3 zIwB=V38lD+mkEY%Z`tSA@`bA2=86Qu#>HA8=rx(2|Ne)ceHmrj&??hsNJIkwjFogV z7IecblZk{{{2}SeeYX1Q<10?^W(lC7uxZgygs^ky<}+@&eO+^`f?f_tL|`_|R5wdO zt#4XENeQ+3OY)HAA8)=`wGt!*gR$u`FysmJlCCSZxd+r5T@sLph5!?vq0&Z>lZb_8 zse~erc|__8 zZ3f~PuzL9LM`nOhn@c|qAp1hLV4vp}H9 z6Aa&Y&)1Gy-CD7v0D*y-$f>VN7L)9gL8QPlRD<{O(BF1nusHT{2xRk-)ArH;k=?(=sM4FY3xgF&MGUFO}_vFMH5 z05$qTY)1e>$t*E^CC+M=Oj;9T)t?N zr%3K2*X0Y3TYPqMNnu_@m}o>&cevzKi9o`$y|%(N)o1@a{!t0RAZ!T`l!Wn*p8fM{ zs@n>)Jz-c$OA(bz@=XR2fw%QLg4=2q{x)`?Xn5F?@I=QBT=?7DYC3{#eONCo#ZS4k z<2EAU8UC{H+~fg^BMZbpVM{}ai7Yr^@wv%m;S67xXk>(&+CvE}Jj+Xk=SRQtli2*8b9pJD{E*j>J3aYKlK}ymzW?|hD>J+M zLLiXKYRZn;r<$Wo_~XXiucaChFeU>mLe;xp`{PCv&QVZq87aG*vlD@|dfps0{+bh=IanM2RUs;--&1mrXKgy+SncQ=Y(t1OuP1ns+gL z0EEd10r2Ntd_)zHU_xQvoHCJofUYz*G=fr6y|10}z_!4`ly; zAytDgRUoQ9X5m0~mM=8kY*dZ+Fs|McIj?%3Z>!o8R!{)|kYhXdmIOBp!LLu<@uysb zG6n=dK&5)9eV^UdpF4E;q3Q$T*gerO^lxB97c(dc@t<}iA&j#{7f7H!aQLD33~lSf z>QLI0CjbHfRorek*?1Uv&`y3Lo?;G%g0#*MdkO-((--=1q$<4c^pacn3Ps{u;!PJ42d z=%NJ`;(X7O-#q$>{2-zr7!;y+{_=qR&yCiJfZkCS?z;PXH{93;f)7E62Tr>EOD8vd zQViJLVzEBTRXgsPTGCIfjDW0CRvxdan%PdZ2u)Q#NA@?34Yxt`^q|n zVSUuuL&Yw{DCd52T~lOlaXBgu{&>|_o~y4}7pw_vl!UM9Q(t**+pG4yWK4e-qJgCc zTnWFz>n+%gY$B?N4u$*w;P2Zfwi5xlTPy+=ME1V6>9qDT9?(`&kQ42oKzs zVkj2F+`shXd#ftf7J?84`al1IaBZQg^5pyamomeQAt;`_se79M~8%DKM-ir357cMZLGf>ir1CPZvSQ(;Zn&p~1f|D~$<_rjBgK z(_jBX?3Wol<(!mkA+aeN2x$MMCrsjqUScE}i!Pv0gTE7Z2%t zn02@4l-@TUz2k7c$+L zg4!m!Ja_Lt2R!6huqc2T`s2BW{00?Kl*2~>!^i_ej~uc0H#qSQJrJV4r%pNb?sPO3 zkvIfd1eDKxvg-QlQu~R3TrE0|L!LPF&j1BP_E_0*bA-?@@Keps9RWy$%4eVb(C7Q^?RjZvFj-x*ZR!*L9KpLz zJ~pOe*Msj_`FPJ0y&cM{-l}%r_(AL$11`a$8w8}9;r9zctQN&ic>+Tz-}Cd-c}49h zB^}HOKs1uv$~g8FEe1^XPi;#BF2SNJhPe0oSr;i6_#cJF2FFhenhUr_K@q zHA$=T0S7XeHz zzy7n!2D3mw05}wcH0_#z)?!O<#r0fX1V9dw!!(d=7JvZanuihyfb@&*!^9vEh;uvl zmJ@>R>lZuS$t@2BAONLx*bjF$v+6r{!v3@diPL+s*t-CrVF}h@w4=LM-wiud--V9V zccU%3BS5fjSZt`a`Z$y`3L*rZ>n=r5TMPI2UoZdV>9?GG+Zlhoto!kzs_$-jBkc6b2Ci!=Mnk^EU_V zd)~OJ@9z5k4L7ub-~kA6|H-#~@#LmYi2;{j(UHL}gyq}^2*@pM`ZsYPczYFGv9)lY zx}UuIn#%G-tg^hmhP+SRKhEmA3vXCGqpGGd5l_ZzD(k9lSp9*EZ1tVHMMvI#3qc$f zDc(Z`0uo^WU2BX6!QxbXSG%rYYvHILzN)VpfAw9DTlL-87F{4QtKJ3}BCdHT0T3WB zx>1%-Hzr}Le52ve~7&W5Cp z$J65F09a+jDG!Coni<}o*A90O#7x!dJ28ae_TRrf!^;{N_dL`!``Byzbar|JaWL3>5qYmA4+Z)u~+mZtwEUgU|o|lA~YB z1t@^v$NXRH^r6cVyBY&_w^;nkbN?S2k3oU+CP1)WQ1>Vg5hUSf-*|`!;#__AXvYQ5 zfAZ;rUi@sw`42ui`)n#7clF(mmjBa-qdbjz!tPg9a9PBNeS?`fDS)1})6FEXRirauT^_|nU^xm1&lfF2L8 zIFk0Fjr`!Qz|Q~j{GbH)qQfu$;auA-2Sy^RSGvQNd;}9Da3~48#)i%!0C}&VsR)M7 zI%9+=l)yUn%qsaLca_X8Tk6yOC7Qc|6b{!yqY%NgQ6+tuvyV8VK0yLhlgnMyCyzKIXZun~ zBLdaIQ-&B1jd~=P1IJo9(0@wPZ@@)>{*zY@ICeSEU8#ry0%VeW^10}iSJiKEKXQ6? zYg5OgOjzCe;nQ2(s&AT8@_owLER^G4DuJa!+)}#spGr0}P$jQfwzZ5XB`Cu_Ih%z- z>N8>8@bbe>=TldXTqKBPQ__@zMlSmF6`eUhOuD9~UNh&(W|IuqmjU~5wZW6ZQUD=B!tBt zl`=@e4M)DMyCYxsLB&C$N@hM|K((nSA+EMj6;6kp_N$i-o)-mByohl!iNW(;y{yxo z4wV^w>NzJAvI9;1GL@FSAJ#bFcl~;@S1e{vssv5;zU$Wk*Ek90^<2{gX4Z!)9Xuue zv=%6_!GGs>x81a8D^QBWwwvDh-3`7HwIBw`aloWz!-wi1Ka#x084c+LZDMuhtKZqR znrIQ$@+Hx()nEP2>PnmNf@D^4Orvx#Kchg+Ex55Dv^b*7scY9qzqv_v#S|7y2&03=?}NLe8PY&!Ay}Ebj<62ee4D|=ZdK$!8EOt6W^Hy zs>u5Pnke`5roI9w*pvRTH}6>WD8KEYxz@P0h_hdk13(nyZ67%Ecfb4Ml_hSqeOV8I zb$FzQ5iWtbrFL$CV(OYkq>@P~_8GD0-n8q;zS@lssT3b2@`Q{W&f@CNEKv{w2D|!C z`Nv;A*|mDA==#c+D%93#X6&ih6Oy^iwT0rIaFZi#haR_xHm7Ies9V=x^5k-1soiN2 z&rV3itdJ~Xm>%dq^((*n&Na7e?<^2h!gP7u$o147V$bM9vm<3K@jZQy{wD+WxL|?U zGJVXA=U@KBe#gr{$aeKE>C8?*cg-V_hg0KM-hSM>|Nh6Ge%}^(nv%XW;H7V6+C;D5R+_K8FIX95aNiFL9g-2 zHG!$m`39OmZCoRC(a;zLP-8^M^(_*hKvy`pBLp8jaG$pH`NhXAdHDSv^pGVFXt}Rl z%q|4nW!-BMn^1M1*FZmH#QUCM^_MkBdZro6R< zCQ?seE)<}qol*lDrL0xx=VDvM*k-{IdCFrI%Db~_01E_&oM<5z9YnMdA`k3wou`$r z>p}nmtfEzb8rPI3;s5QNhjN2J3`8Xn=l_2$h&l3mfYwDRzUIfJvy^2{6&F zwF!&>t1&Ccjul$XzrYEobux!W)nDUT0lS|7Qh=a7{+rRI@ig@~KpUh02cRLFbG$da z?+&ZNzCr~x;>Yo99ECDD+CZraoo*q?F|L4S#oBxXfKhrjyVTmB(%>pdg%1N1$x*}F zRjmk1{(j3tm)5A#pj=};C{W^5feNR_@T_f7=q64T)Ic|{)SDIN=s>IeRS2;LB;8Pn z#_+=AsN29qRpv4lVU7=UPped9)o&e65MI?r{Sha0Oq72PXoX6I+c=Fa(QG6AewZBs zB`_Gfjp=Uyic^JZa3{>+fPTYWsW+V|5p2`9gH7rNE82a9va1u6{Qzaa@vnO};2$W` d8!X>xIs#P;W(|=_l@I^`002ovPDHLkV1hJ$e&+xH diff --git a/res/drawable/all_apps_button_icon.xml b/res/drawable/all_apps_button_icon.xml deleted file mode 100644 index 7c69cad3ac..0000000000 --- a/res/drawable/all_apps_button_icon.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - diff --git a/res/layout/all_apps_button.xml b/res/layout/all_apps_button.xml deleted file mode 100644 index 4bc780a708..0000000000 --- a/res/layout/all_apps_button.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index b211207587..691219af63 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -16,7 +16,6 @@ - 8dp 64dp 180dp diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3bb7a797a7..58fce34826 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -76,7 +76,6 @@ -26dp - 0dp 48dp 30dp 40dp diff --git a/res/xml/dw_phone_hotseat.xml b/res/xml/dw_phone_hotseat.xml index b58994d1d7..c691ebc3da 100644 --- a/res/xml/dw_phone_hotseat.xml +++ b/res/xml/dw_phone_hotseat.xml @@ -16,7 +16,7 @@ - + - + + + + - + - + + + { - if (!mLauncher.isInState(ALL_APPS)) { - mLauncher.getUserEventDispatcher().logActionOnControl(Action.Touch.TAP, - ControlType.ALL_APPS_BUTTON); - mLauncher.getStateManager().goToState(ALL_APPS); - } - }); - allAppsButton.setOnFocusChangeListener(mLauncher.mFocusHandler); - } - - // Note: We do this to ensure that the hotseat is always laid out in the orientation of - // the hotseat in order regardless of which orientation they were added - int x = getCellXFromOrder(allAppsButtonRank); - int y = getCellYFromOrder(allAppsButtonRank); - CellLayout.LayoutParams lp = new CellLayout.LayoutParams(x, y, 1, 1); - lp.canReorder = false; - mContent.addViewToCellLayout(allAppsButton, -1, allAppsButton.getId(), lp, true); - } } @Override diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 22bc162b65..70845541b8 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -28,7 +28,6 @@ import android.util.Xml; import android.view.Display; import android.view.WindowManager; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.ConfigMonitor; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.Thunk; @@ -314,17 +313,6 @@ public class InvariantDeviceProfile { return this; } - public int getAllAppsButtonRank() { - if (FeatureFlags.IS_DOGFOOD_BUILD && FeatureFlags.NO_ALL_APPS_ICON) { - throw new IllegalAccessError("Accessing all apps rank when all-apps is disabled"); - } - return numHotseatIcons / 2; - } - - public boolean isAllAppsButtonRank(int rank) { - return rank == getAllAppsButtonRank(); - } - public DeviceProfile getDeviceProfile(Context context) { return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? landscapeProfile : portraitProfile; diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 67bdd3bdde..98d650d378 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2019,22 +2019,8 @@ public class Workspace extends PagedView } public void onNoCellFound(View dropTargetLayout) { - if (mLauncher.isHotseatLayout(dropTargetLayout)) { - Hotseat hotseat = mLauncher.getHotseat(); - boolean droppedOnAllAppsIcon = !FeatureFlags.NO_ALL_APPS_ICON - && mTargetCell != null && !mLauncher.getDeviceProfile().inv.isAllAppsButtonRank( - hotseat.getOrderInHotseat(mTargetCell[0], mTargetCell[1])); - if (!droppedOnAllAppsIcon) { - // Only show message when hotseat is full and drop target was not AllApps button - showOutOfSpaceMessage(true); - } - } else { - showOutOfSpaceMessage(false); - } - } - - private void showOutOfSpaceMessage(boolean isHotseatLayout) { - int strId = (isHotseatLayout ? R.string.hotseat_out_of_space : R.string.out_of_space); + int strId = mLauncher.isHotseatLayout(dropTargetLayout) + ? R.string.hotseat_out_of_space : R.string.out_of_space; Toast.makeText(mLauncher, mLauncher.getString(strId), Toast.LENGTH_SHORT).show(); } diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java index f4c6380b74..05fc33f35e 100644 --- a/src/com/android/launcher3/config/BaseFlags.java +++ b/src/com/android/launcher3/config/BaseFlags.java @@ -31,12 +31,8 @@ abstract class BaseFlags { public static final boolean IS_DOGFOOD_BUILD = false; public static final String AUTHORITY = "com.android.launcher3.settings".intern(); - // When enabled allows to use any point on the fast scrollbar to start dragging. - public static final boolean LAUNCHER3_DIRECT_SCROLL = true; // When enabled the promise icon is visible in all apps while installation an app. public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = false; - // When enabled allows use of spring motions on the icons. - public static final boolean LAUNCHER3_SPRING_ICONS = true; // Feature flag to enable moving the QSB on the 0th screen of the workspace. public static final boolean QSB_ON_FIRST_SCREEN = true; diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 551567ae78..b3d9bdd72d 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -16,6 +16,8 @@ package com.android.launcher3.dragndrop; +import static com.android.launcher3.ItemInfoWithIcon.FLAG_ICON_BADGED; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.FloatArrayEvaluator; @@ -57,8 +59,6 @@ import com.android.launcher3.Utilities; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.ShortcutConfigActivityInfo; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.graphics.IconNormalizer; import com.android.launcher3.graphics.LauncherIcons; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; @@ -70,8 +70,6 @@ import com.android.launcher3.widget.PendingAddShortcutInfo; import java.util.Arrays; import java.util.List; -import static com.android.launcher3.ItemInfoWithIcon.FLAG_ICON_BADGED; - public class DragView extends View { private static final ColorMatrix sTempMatrix1 = new ColorMatrix(); private static final ColorMatrix sTempMatrix2 = new ColorMatrix(); @@ -198,7 +196,7 @@ public class DragView extends View { */ @TargetApi(Build.VERSION_CODES.O) public void setItemInfo(final ItemInfo info) { - if (!(FeatureFlags.LAUNCHER3_SPRING_ICONS && Utilities.ATLEAST_OREO)) { + if (!Utilities.ATLEAST_OREO) { return; } if (info.itemType != LauncherSettings.Favorites.ITEM_TYPE_APPLICATION && diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java index d9b1a3f9e7..12daea50fd 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTask.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java @@ -138,10 +138,7 @@ public class GridSizeMigrationTask { */ protected boolean migrateHotseat() throws Exception { ArrayList items = loadHotseatEntries(); - - int requiredCount = FeatureFlags.NO_ALL_APPS_ICON ? mDestHotseatSize : mDestHotseatSize - 1; - - while (items.size() > requiredCount) { + while (items.size() > mDestHotseatSize) { // Pick the center item by default. DbEntry toRemove = items.get(items.size() / 2); @@ -171,9 +168,6 @@ public class GridSizeMigrationTask { } newScreenId++; - if (!FeatureFlags.NO_ALL_APPS_ICON && mIdp.isAllAppsButtonRank(newScreenId)) { - newScreenId++; - } } return applyOperations(); diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 6378ea1804..744e98aeaa 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -24,7 +24,6 @@ import android.content.Intent.ShortcutIconResource; import android.content.pm.LauncherActivityInfo; import android.database.Cursor; import android.database.CursorWrapper; -import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.UserHandle; import android.provider.BaseColumns; @@ -387,15 +386,6 @@ public class LoaderCursor extends CursorWrapper { protected boolean checkItemPlacement(ItemInfo item, ArrayList workspaceScreens) { long containerIndex = item.screenId; if (item.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { - // Return early if we detect that an item is under the hotseat button - if (!FeatureFlags.NO_ALL_APPS_ICON && - mIDP.isAllAppsButtonRank((int) item.screenId)) { - Log.e(TAG, "Error loading shortcut into hotseat " + item - + " into position (" + item.screenId + ":" + item.cellX + "," - + item.cellY + ") occupied by all apps"); - return false; - } - final GridOccupancy hotseatOccupancy = occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT); diff --git a/src/com/android/launcher3/provider/ImportDataTask.java b/src/com/android/launcher3/provider/ImportDataTask.java index b1dd003f81..16c7417aa5 100644 --- a/src/com/android/launcher3/provider/ImportDataTask.java +++ b/src/com/android/launcher3/provider/ImportDataTask.java @@ -308,9 +308,6 @@ public class ImportDataTask { LongArrayMap hotseatItems = GridSizeMigrationTask.removeBrokenHotseatItems(mContext); int myHotseatCount = LauncherAppState.getIDP(mContext).numHotseatIcons; - if (!FeatureFlags.NO_ALL_APPS_ICON) { - myHotseatCount--; - } if (hotseatItems.size() < myHotseatCount) { // Insufficient hotseat items. Add a few more. HotseatParserCallback parserCallback = new HotseatParserCallback( diff --git a/src/com/android/launcher3/util/FocusLogic.java b/src/com/android/launcher3/util/FocusLogic.java index b793f5481f..4f4cccd7a9 100644 --- a/src/com/android/launcher3/util/FocusLogic.java +++ b/src/com/android/launcher3/util/FocusLogic.java @@ -201,10 +201,6 @@ public class FocusLogic { ViewGroup hotseatParent = hotseatLayout.getShortcutsAndWidgets(); boolean isHotseatHorizontal = !dp.isVerticalBarLayout(); - boolean moreIconsInHotseatThanWorkspace = !FeatureFlags.NO_ALL_APPS_ICON && - (isHotseatHorizontal - ? hotseatLayout.getCountX() > iconLayout.getCountX() - : hotseatLayout.getCountY() > iconLayout.getCountY()); int m, n; if (isHotseatHorizontal) { @@ -215,19 +211,7 @@ public class FocusLogic { n = hotseatLayout.getCountY(); } int[][] matrix = createFullMatrix(m, n); - if (moreIconsInHotseatThanWorkspace) { - int allappsiconRank = dp.inv.getAllAppsButtonRank(); - if (isHotseatHorizontal) { - for (int j = 0; j < n; j++) { - matrix[allappsiconRank][j] = ALL_APPS_COLUMN; - } - } else { - for (int j = 0; j < m; j++) { - matrix[j][allappsiconRank] = ALL_APPS_COLUMN; - } - } - } - // Iterate thru the children of the workspace. + // Iterate through the children of the workspace. for (int i = 0; i < iconParent.getChildCount(); i++) { View cell = iconParent.getChildAt(i); if (!cell.isFocusable()) { @@ -235,17 +219,6 @@ public class FocusLogic { } int cx = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellX; int cy = ((CellLayout.LayoutParams) cell.getLayoutParams()).cellY; - if (moreIconsInHotseatThanWorkspace) { - int allappsiconRank = dp.inv.getAllAppsButtonRank(); - if (isHotseatHorizontal && cx >= allappsiconRank) { - // Add 1 to account for the All Apps button. - cx++; - } - if (!isHotseatHorizontal && cy >= allappsiconRank) { - // Add 1 to account for the All Apps button. - cy++; - } - } matrix[cx][cy] = i; } diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java index 05bab8b459..ed1cf4f1ed 100644 --- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java +++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java @@ -224,8 +224,7 @@ public class RecyclerViewFastScroller extends View { } if (isNearThumb(x, y)) { mTouchOffsetY = mDownY - mThumbOffsetY; - } else if (FeatureFlags.LAUNCHER3_DIRECT_SCROLL - && mRv.supportsFastScrolling() + } else if (mRv.supportsFastScrolling() && isNearScrollBar(mDownX)) { calcTouchOffsetAndPrepToFastScroll(mDownY, mLastY); updateFastScrollSectionNameAndThumbOffset(mLastY, y); diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java index b92f61205c..031909fe12 100644 --- a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java +++ b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java @@ -16,7 +16,6 @@ import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherProvider; import com.android.launcher3.LauncherSettings; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.model.GridSizeMigrationTask.MultiStepMigrationTask; import com.android.launcher3.util.TestLauncherProvider; @@ -87,13 +86,8 @@ public class GridSizeMigrationTaskTest { mIdp.numHotseatIcons = 3; new GridSizeMigrationTask(mContext, mIdp, mValidPackages, 5, 3) .migrateHotseat(); - if (FeatureFlags.NO_ALL_APPS_ICON) { - // First item is dropped as it has the least weight. - verifyHotseat(hotseatItems[1], hotseatItems[3], hotseatItems[4]); - } else { - // First & last items are dropped as they have the least weight. - verifyHotseat(hotseatItems[1], -1, hotseatItems[3]); - } + // First item is dropped as it has the least weight. + verifyHotseat(hotseatItems[1], hotseatItems[3], hotseatItems[4]); } @Test @@ -109,13 +103,8 @@ public class GridSizeMigrationTaskTest { mIdp.numHotseatIcons = 3; new GridSizeMigrationTask(mContext, mIdp, mValidPackages, 5, 3) .migrateHotseat(); - if (FeatureFlags.NO_ALL_APPS_ICON) { - // First item is dropped as it has the least weight. - verifyHotseat(hotseatItems[1], hotseatItems[3], hotseatItems[4]); - } else { - // First & third items are dropped as they have the least weight. - verifyHotseat(hotseatItems[1], -1, hotseatItems[4]); - } + // First item is dropped as it has the least weight. + verifyHotseat(hotseatItems[1], hotseatItems[3], hotseatItems[4]); } private void verifyHotseat(long... sortedIds) { diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index f16f514cd1..dd91fe86d2 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -43,13 +43,11 @@ import com.android.launcher3.MainThreadExecutor; import com.android.launcher3.R; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.compat.LauncherAppsCompat; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.testcomponent.AppWidgetNoConfig; import com.android.launcher3.testcomponent.AppWidgetWithConfig; import org.junit.Before; -import java.util.Locale; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -101,19 +99,12 @@ public abstract class AbstractLauncherUiTest { */ protected UiObject2 openAllApps() { mDevice.waitForIdle(); - if (FeatureFlags.NO_ALL_APPS_ICON) { - UiObject2 hotseat = mDevice.wait( - Until.findObject(getSelectorForId(R.id.hotseat)), 2500); - Point start = hotseat.getVisibleCenter(); - int endY = (int) (mDevice.getDisplayHeight() * 0.1f); - // 100 px/step - mDevice.swipe(start.x, start.y, start.x, endY, (start.y - endY) / 100); - - } else { - mDevice.wait(Until.findObject( - By.desc(mTargetContext.getString(R.string.all_apps_button_label))), - DEFAULT_UI_TIMEOUT).click(); - } + UiObject2 hotseat = mDevice.wait( + Until.findObject(getSelectorForId(R.id.hotseat)), 2500); + Point start = hotseat.getVisibleCenter(); + int endY = (int) (mDevice.getDisplayHeight() * 0.1f); + // 100 px/step + mDevice.swipe(start.x, start.y, start.x, endY, (start.y - endY) / 100); return findViewById(R.id.apps_list_view); }