From c50438c802355dff714b04f42a32e518cb9e91d8 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Tue, 19 Aug 2014 17:43:05 -0700 Subject: [PATCH] Unify next / prev page hints for drag and drop across devices -> Eliminate the white bgs on tablets during drag (issue 15880213) -> Add stateful (active and rest) next / prev page hints (issue 15937059) -> Fix recent regression which allowed overscroll in custom content area Change-Id: I1198dc88ca8570cb9e1afd3ca939be06a8dea92e --- res/drawable-hdpi/ic_pageindicator_add.png | Bin 718 -> 945 bytes res/drawable-hdpi/ic_pageindicator_current.png | Bin 730 -> 1013 bytes res/drawable-hdpi/ic_pageindicator_default.png | Bin 471 -> 1046 bytes res/drawable-hdpi/page_hover_left.9.png | Bin 0 -> 170 bytes res/drawable-hdpi/page_hover_left_active.9.png | Bin 0 -> 160 bytes res/drawable-hdpi/page_hover_left_holo.9.png | Bin 2916 -> 0 bytes res/drawable-hdpi/page_hover_right.9.png | Bin 0 -> 155 bytes res/drawable-hdpi/page_hover_right_active.9.png | Bin 0 -> 158 bytes res/drawable-hdpi/page_hover_right_holo.9.png | Bin 243 -> 0 bytes res/drawable-hdpi/quantum_panel.9.png | Bin 636 -> 705 bytes res/drawable-mdpi/ic_pageindicator_add.png | Bin 549 -> 669 bytes res/drawable-mdpi/ic_pageindicator_current.png | Bin 579 -> 738 bytes res/drawable-mdpi/ic_pageindicator_default.png | Bin 412 -> 746 bytes res/drawable-mdpi/page_hover_left.9.png | Bin 0 -> 141 bytes res/drawable-mdpi/page_hover_left_active.9.png | Bin 0 -> 156 bytes res/drawable-mdpi/page_hover_left_holo.9.png | Bin 2858 -> 0 bytes res/drawable-mdpi/page_hover_right.9.png | Bin 0 -> 140 bytes res/drawable-mdpi/page_hover_right_active.9.png | Bin 0 -> 153 bytes res/drawable-mdpi/page_hover_right_holo.9.png | Bin 180 -> 0 bytes res/drawable-mdpi/quantum_panel.9.png | Bin 438 -> 462 bytes res/drawable-xhdpi/ic_pageindicator_add.png | Bin 809 -> 1192 bytes res/drawable-xhdpi/ic_pageindicator_current.png | Bin 872 -> 1264 bytes res/drawable-xhdpi/ic_pageindicator_default.png | Bin 531 -> 1301 bytes res/drawable-xhdpi/page_hover_left.9.png | Bin 0 -> 166 bytes res/drawable-xhdpi/page_hover_left_active.9.png | Bin 0 -> 166 bytes res/drawable-xhdpi/page_hover_left_holo.9.png | Bin 2956 -> 0 bytes res/drawable-xhdpi/page_hover_right.9.png | Bin 0 -> 177 bytes res/drawable-xhdpi/page_hover_right_active.9.png | Bin 0 -> 182 bytes res/drawable-xhdpi/page_hover_right_holo.9.png | Bin 272 -> 0 bytes res/drawable-xhdpi/quantum_panel.9.png | Bin 908 -> 900 bytes res/drawable-xxhdpi/ic_pageindicator_add.png | Bin 1370 -> 1607 bytes res/drawable-xxhdpi/ic_pageindicator_current.png | Bin 1197 -> 1865 bytes res/drawable-xxhdpi/ic_pageindicator_default.png | Bin 648 -> 1812 bytes res/drawable-xxhdpi/page_hover_left.9.png | Bin 0 -> 206 bytes res/drawable-xxhdpi/page_hover_left_active.9.png | Bin 0 -> 207 bytes res/drawable-xxhdpi/page_hover_left_holo.9.png | Bin 3026 -> 0 bytes res/drawable-xxhdpi/page_hover_right.9.png | Bin 0 -> 199 bytes res/drawable-xxhdpi/page_hover_right_active.9.png | Bin 0 -> 203 bytes res/drawable-xxhdpi/page_hover_right_holo.9.png | Bin 3015 -> 0 bytes res/drawable-xxhdpi/quantum_panel.9.png | Bin 1380 -> 1354 bytes src/com/android/launcher3/CellLayout.java | 26 +++++++++---- src/com/android/launcher3/DragLayer.java | 44 ++++++++++++++++------ src/com/android/launcher3/Workspace.java | 28 +++++++------- 43 files changed, 66 insertions(+), 32 deletions(-) create mode 100644 res/drawable-hdpi/page_hover_left.9.png create mode 100644 res/drawable-hdpi/page_hover_left_active.9.png delete mode 100644 res/drawable-hdpi/page_hover_left_holo.9.png create mode 100644 res/drawable-hdpi/page_hover_right.9.png create mode 100644 res/drawable-hdpi/page_hover_right_active.9.png delete mode 100644 res/drawable-hdpi/page_hover_right_holo.9.png create mode 100644 res/drawable-mdpi/page_hover_left.9.png create mode 100644 res/drawable-mdpi/page_hover_left_active.9.png delete mode 100644 res/drawable-mdpi/page_hover_left_holo.9.png create mode 100644 res/drawable-mdpi/page_hover_right.9.png create mode 100644 res/drawable-mdpi/page_hover_right_active.9.png delete mode 100644 res/drawable-mdpi/page_hover_right_holo.9.png create mode 100644 res/drawable-xhdpi/page_hover_left.9.png create mode 100644 res/drawable-xhdpi/page_hover_left_active.9.png delete mode 100644 res/drawable-xhdpi/page_hover_left_holo.9.png create mode 100644 res/drawable-xhdpi/page_hover_right.9.png create mode 100644 res/drawable-xhdpi/page_hover_right_active.9.png delete mode 100644 res/drawable-xhdpi/page_hover_right_holo.9.png create mode 100644 res/drawable-xxhdpi/page_hover_left.9.png create mode 100644 res/drawable-xxhdpi/page_hover_left_active.9.png delete mode 100644 res/drawable-xxhdpi/page_hover_left_holo.9.png create mode 100644 res/drawable-xxhdpi/page_hover_right.9.png create mode 100644 res/drawable-xxhdpi/page_hover_right_active.9.png delete mode 100644 res/drawable-xxhdpi/page_hover_right_holo.9.png diff --git a/res/drawable-hdpi/ic_pageindicator_add.png b/res/drawable-hdpi/ic_pageindicator_add.png index 4bb8bfa072a75883b3193517673e40c997ec9ea1..ab0e5dbd530b76f05511ae4096ecbd901ae713aa 100644 GIT binary patch delta 758 zcmVZizhuqFOrkq1i_m}y^23zZ(clj+MnVd(Ep&Y z7Y~wUqX;2{m=H8sGCg0;bnPJ%H^`vNK4=Q6>FU?7UN!JBC|U2qNJ|z91q4Ar0O;)O z%-G%C743E#qtOU!YioFVdisa^fB&)&Z!R*DTq-+}mMoP@06lp90NCH(&!n-MXG8#KYimp7^Lc5SrYshV z3(RaVv*`7D3jiblV|#mB*tSgoD4Wd!$;NzV=<4bUOG``a`@R^BM#Rhve}I)z1OS~* zhi`6fW+XTaLjYh20ES^8j$;BKPEJm&FbuPgkB>rYEs4kgK>2*$T3ubu?d0`LWnGYez)6YBErGJ0jK%K z1Ynz{Spx6{Ky^GG|8g8BJUu?WdsiuhP^?HVx#c(*JTrQU- zB9Z8r1z;>MFN;d0BHQh@>vfZ(f4=Wq03rZ!u~<|9 zew(H#Zf|d6t+fV#D2n*4j~D<)QKYNYs!k5aVv5Y-;v$$is?};7$FZK-;@uJHcDoEf z4+ewi?(XjU{r&y7>+9=hA`%Y|4|=}9yvV6zk}R1-PU6dq`P&1j-$*8tK_USk9v;d@ zqaphJ{)^){TqqQH5Y8_Dg?Fd^4^((6L!4>Hqmw%V8W%V%Fg8>%HaapfIyEpYFgH3d oF!jQLI+JVy8W%V%Fg8>%HaajiIx#jaFgH3dFxj=B{*#>oF{4US`Tzg` delta 529 zcmdnUevVbKGr-TCmrII^fq{Y7)59eQM1wE~8;~q|{iJ51Vo^QgJWm(L5RLP5gABW+ z93^TWpGm#0>!--5+r%Pv#N@h0RL<5I<*E)kbsZkqsY#jhlWlD z?UQ=ny?gVU|ZLx~#s+#LRHca*;;U>s=8#Vy%A57eBW6H!1bzJ(IK2 ziY#-_KVLaTh~a?6bB2bz?cFa+ywoP2WMy#W_{eaFc}L{hF!85Fmc=se#pmXiFgq-~ zoA+Y)+K8?zQs$)~L6WA6r=Q96q!&@=Ths$!y8|xwp@&oZckB!l*6Qt-ADz`|WM(rvzR4{@41l$@b%q4L9g$PYtr$XQQ4L$>wyz z`q+)70*g*aIB$)zJys|a;5GRUSM^-8r6!)*lb)3CjpN^X?Z*4>g>{S!Hs`BvcKms? z`oa9HN0s-YqrO|zGe+qgdOvsbZI?Ow%L)vR11Zj^k*|jGdjGSM7HDeY@R$zrDTvikaa!j#jJH3;;5V8Tm>G0w88* zXAJ;yV`HP#@Ap6YzW+T40uF+Jec%7y@Ap5hudkN?$c!tp*x_7+ZQB}vf85^Q-izDY z+pl35au5XRsNLP&@y*T6m)+gn7XWf|b90)MQXrcFS(b&VsVT|KgQcaVmZoWQ%$#J) z5Dz@1RHEy;?Kn=0nFrI;)6%l6;nHYjWkmx(TU%SNJ(N*N0F_FGn3=29>Kh@%e=`7TjE)F^5<)z$R;zEAnP+BZ=%Fl%d&8Jc`1`5`D0;We_<(~&rdQlXO%Gk z^^Sm$&ISfPgJkRTN zI-i@(<~sm|j5`$Ma5IKsP#nipE|-lciu9|iE4jM5`gU<~@g)Ep92|7l*4EBSrBZ5| zW^#Uh9vg05UK!G%YYVEig7zF*Z6fF*-FcEigAaH!v{u!ht#f001R)MObuX vVRU6WZEs|0W_bWIFflYOFgPtRHdHY-IxsdmF*YqQH##sd*|nhllc@qRi;sso delta 584 zcmey$ev4JHGr-TCmrII^fq{Y7)59eQNQ;3m2OE$)vL(lQqGC}!<0?-V#}JFtTd(Zx z3NaKp@bUiHKC|tYgN__Jcg$;osH+ZZ{DE_)4!IW`>^~Otf%OlA{DHU}mS{ni=+;mH zK^Do@n=^Nc6+cQzDk~HC=5WF{@0`8*^KR!!>$Y0T^`Cwk_V|ts+l$|IwmX=XF)e!k z`&w%;k8Z_wHmlVyk+EeWZZK}p|jvt<}nP=f=ZvO&ldoJgHhq4RW z;*MY5P;qqr!pp30WY<0N=JjuN;(B2w$6g}!dvVf}1iu2Y^V}KXhfaAMW|ryocDr@y z=uAz$$7yFz%SRjLyDxZl^q$qpU*<{kuG)VR))RBQ<+ACXgZ=>$aX>Lo48oyr^=ASg@di=)Se1Ev?b(ywzS{H4IdmQ~C?0_Y=-J{4iZ)F+g zivQ~W!%9#eBDna`fIe-${(8V{Ng@;w{Y6duHdB;bh7?S-FwiH%E{mAU(9;% zuxxMK#8a*x_nhC+6fO4mLAl_C_Z5xYJF;)q+l8m>uZ#KpPo%G%yG%LYXUyh@|0jpB z?%DjNth8;(5BqG#*$UO_QmvAUQh^kM zk%6I!u7SC(p+$(Hk(Gggm9aUH3uL4&TUvvnAvZrIGp!P&K?<(J(8|=*%ETC=!niZf0s_D<1=%6 ze}Dhp^SsP(IMmDx5%~f{MC|*%(d~A1qtTeH)oOoRmh~2Z8j~wTWGbZ=9mjbyH#hfw zXJ_Z$_kF&*yAu%+20*rLV`gT?5RqhQX{nLPWPTEnXxuuFH;G83l&Y+(tTaR4de>um@`aBJ#{4e^e|Mt;felGYmsxZEY>6R4VSc{r>Lm?#FySpPHr_U0q#0Dy1Zj z70CGh13cxD>IoEZ+4}!q@rfHun&P-ZsD5YqAem;}W=NSOPFw|#f zXGt8#!pzWG%Qt~u5c}Vc?O$m>LlLI9rj-By03~!qSaf7zSafANV{&C-bY%cCFflYO zFgPtRHdHY-Ix;spGd3+SH##sdU1QC_0000bbVXQnWMOn=I&E)cX=Zr%HaaplIx;pbFgH3dFyNGR;*+KUF}n?+-~a#s delta 323 zcmbQnah+MQGr-TCmrII^fq{Y7)59eQM1wE~8;~q|{iJ51Vo^QAa!(h>5RLP5C;4(6 za^PvTKOHeaX4wnfn4Q8eS-HEa^%bjTDuui(nfxNTz;yG;^VRw%Q`of5Y0W8=F`a+p ze@k+j{X~vM9{++Z+6_b#*vt+H-e4?$z_f?uf0xomwsi;Y9rrrGX~FRRfvFzX?cE8V zDn9K9k5it@V8uB3!Q4+t^?P>wxcv6b<0(Ja%uU_9BW!3HFGZnV7xQY^(zo*^7SP{WbZ0pxQQctjR6 zFmQK*Fr)d&(`$i(KAtX)AsQ3kPBP?cFyLX_9BW!3HFGZnV7xQY^(zo*^7SP{WbZ0pxQQctjR6 zFmQK*Fr)d&(`$i(PM$7~AsQ3kUfRpapup2|Q9tQr+`IkVee0-L`<7pmN(Ee22WQ%mvv4FO#r)& BFwX!0 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/page_hover_left_holo.9.png b/res/drawable-hdpi/page_hover_left_holo.9.png deleted file mode 100644 index 8a1aa5fe85aa516318c05e04742a1c32adc9af09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2916 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 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/page_hover_right_active.9.png b/res/drawable-hdpi/page_hover_right_active.9.png new file mode 100644 index 0000000000000000000000000000000000000000..cd5b42db2c874d25730f3acc2f0e61ce962a73f4 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^>_9BW!3HFGZnV7xQY^(zo*^7SP{WbZ0pxQQctjR6 zFmQK*Fr)d&(`$i(4xTQKAsQ2tfBgS%&n)uC{csDT&(s6=_Eum2)6T@k*7o1WqiaU} zpC1SN)^JA(G52`!m7Ux#BO_z~QPYj}hmZurRbKgj!O}*{fMzjxy85}Sb4q9e0Gr1! AJpcdz literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/page_hover_right_holo.9.png b/res/drawable-hdpi/page_hover_right_holo.9.png deleted file mode 100644 index abf8f517312e26e9861271a1c29e1dbb6b701e72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^96&6^!3HF|1ZAax6icy_X9x!n)NrJ90QsB+9+AZi z4BVX{%xHe{^je_cR8JSj5RHj%CtLF|8S=Q?XA%22QGj>Rz2EU|vziqY1)MjY)7q^V za53?u>l^bjCF>i{dL=jHhNQAJGN@Rdoy7T~!E^(=hw)RP8;tA=&NI4uw*KOX*|Z^N zp+L^*ZIi8!?EKC0B+PfgCi@TC2Oj!9;Jg#v(8yk(+gP||W07`S>rDoA&*vxK{xgRmT7T diff --git a/res/drawable-hdpi/quantum_panel.9.png b/res/drawable-hdpi/quantum_panel.9.png index a005e0baa546701d40f30b0d2b304619a43bc1b4..914961a2601e3af3a8874a00f08093bf1c4a9955 100644 GIT binary patch delta 643 zcmV-}0(|}a1i=N6Nq=KWL_t(&f$f?xj@nQVK;O5$f=C28HBBmnloOB?oMA7JpmaGw zN-D0fZKS;kMMAk%1SwNcgIJ=lHuj{jEzk;WJjMoL{U?1HA@I!e*dO~3Mno{iP$F`| zcS}n|MQ5i{r`MdQr$4Vi5OXjN-zytA@>(URNq_24%1Os_$+D4j#OaWO z@n5u+%cR`-eBN)j+Z_=x0NJ(-j4_gJ*X#A7*XvDzh(s{Ty&uKr49UUpHk-{|v)TNl z%(*bz?e@OaYJCBA>Bv<*jhqAAOeT|e{eJ(uh&19jE}U>)9LK>J^E91KKMV$gpFqg| z6nzoRX=wnj+kfreib!L(+Z9Y#M;ym^p4aGhySKnElFH@6QN(coFAT%xxo=8EgfI-7 zB*n;`vqsJUZV&|SCFFu2Z~+&^?5viHqR3oAE{Y;Ug>nF<%qd?(8dnutD~E`j{Xwu` zOi{~S6ISk8sl8lnmx*d$xr_X6orBs}uC`dYYsJc4D}Pq*N-=eot99kna+kizR>jxI zWjn5ZCH7cwk!%?~x1hFi@oYAGP=2Qr=JWXj$^)xePWOP_@CJGRfTwmKXZgyJcLVLusC2g0zSXHg#!S;k1^fh%Nq-(mL_t(&f$f<=Zrd;rML#JE0h}(f`bFZM)rm25{qJXfvTKne~vdvZ|`5#bWV= zh{Q7_MJa`%C~!WXe=L{FuK>;f44SjYU6y5`wZ11JSZh0mEJtg74>!5S$I-Ynb<+<# zA;SfL62R@42Y*xV>(={jy@^RPR{$u-K5<9>g1A952fQ!Kl9@-pQh0wQ1iQ0DTwsh- z$soSFe8jJnwSQu0Lzm1=hAeKX%wF7V%S5x!+%>;jNtu1-W=j?~RkFCLlEqDxEN-e~ zah|wVe@$A)&{kaBfUrdLTO3kPywA8#FlcG-Z&TuMIDdSXhu079^RnCXU!>wJ09vh9 z5BvT8Co>y)m?GF1bKLEAkL&gN0m3ei7S{^ zS-7@Uus5XQ!vA7XsT=;HT{4r&WHOn|#8J!)rNjq}Yn>EY2g=NN13xw+mPMW500000 M07*qoM6N<$f)Y;dx-=J@B(5AV&Q9m&+!6e7-V%zDS=7|Xl6t+#A+0?r< z;%aQ;I_p}q%(?bAn8nXMocCaN%z}WuaqONGjucpgEWUVR_mi~Eo&PHc>{hQD?36OUBw{WnkLWWBEEmfN{sw`pHCIr_84ZS~bjfg-I80a{bv9WwaC$k6Mi z{G!B4h+)mv^%6l|u0a!zJS^DZfBDPG9gfpZr&b=F?YF#3W!mYdzSC0ouieTYIc@En z;_Box&BgBuw?@?}cUtsKO<$|ZkYhGmeCd^c6*jlBwpL9Fs`8xlrdi>~?%Qww)nCan zl}Ns)Sb5H}UuDZR`(DHIDjVI=oXYLD&p!YBQ=B2dtJSGvJ%hnapQgC= z(@IfpMT(;u;fCl9E`GYL#4+3Zxi}3=BpG%t8#! xtc(n;Obv7m%&iOzz8-3{g6M#1$jwj5OshoGU|?otXa>=6bL)bClfN(;0su|@-SYqd delta 359 zcmbQsx|Bt+Gr-TCmrII^fq{Y7)59eQNOOWP2OE%lFp*7QqGC}!!&gri#}J9jy?qEhF1{VDt(FBFOIr~YY=orWBK0P%*jVL1j8;kI zfDFpm+iWvdg2Kg*nYnKoH`yF`s;4;T000Jq0jkw1T-U{XK9@ldJOn}T;QPLGT^E%~ z1^s>>06@$PB0{-brf#>Zw%cuLe_0j_A#l6hsL^Ps*=&{`4hLptyocKDw#Cc{!|*YV ztwlHeqv_$zAuI2I067_wb~OADF6uof9p;{M53`W!{k zYZOJV)9LgXK>qGNP6a&AKBHc*XW6zb0SExXwr$z#^(@cx=)Y5Gn&NV~;Cj8nwrz1f zpCtek3WZE-ZF0FB^7%ZJQuqT_QPNh$-@7)GumKtuI4v+XR53O>GBG+eFfA}QIxsNx m!ht%I;Q<;KI4v+XR53O>Fg7|dHZ3qWIxsNVwV?i!5&|(ez3_+< zfjn#-Nsw@UTGRCPQr3a*68;-dAfW2zvkMyl>X=XN%Yip^e_GWgB``Z5}aw|M)F- z$E4jWc61cyxZP2$Z)%TIpC0eGXM0;ZF51Z*mEAgxuPNqJr;(y^4yda zSSG2k`4FYE4CcSFqzbr=)th#{`;F1Hs?OsxbKZS zUbK_N(71!+XwpQP;}_38FRoveDaEZgL4`9^OEh_<;zn<)R zcRg->xW{D^!LL=ZdScy2KJWSNweoqpVd^sxhABbk=RMy$`}}jy)mJASGVx_(cv@fd zv$Mm5fwSRIGpAtY)1sf83_h1doV++0PJE8}bF+E>f_hU;RTmLgONKdq%jch&V;>a6 zpedMnW{zzCad8HY!v@m}Wj?2EzPRl2%k15E(=MAtJ8>u}9XwOAGscdetvP@BWluK8 z348Bm-QM=>_dXfE_O)4CZ?QETe)u8TXy%?9_1otD+&7=;!S+qlQYXIN#Tt8Em4VUW z#V$SBtlSH8BK=D4sR~3LP?-!jK^0CU(3~Z)r;q*VZWB{S5cE9<=;duJ9Ka zqpBsY5hW>!C8<`)MX5lF!N|bSMAyJV*T5{q(9Fun+{)NY*TCG$z#umH>;b5T$&QS| T;z&x2ph_N0DSb3Ko6!&e%Lx1B delta 263 zcmaFGI)_=YGr-TCmrII^fq{Y7)59eQNOOWP2OE%lFp*7QqGC}!Lyo75V~E7%(g_>6 z8Vq<`;%}Y%H+6QgdHp%xa`pdSFCrcZJ=B@;w8*ofW%D(uAW4G*jsN(%WoGC-nW5s$ zuC<|c*Q6o=tqtz`kNsmP;?g-FQ^kL8Qo{NRnIGbw+*B@M^!s>Mg-Q6;@obiV(=Rid zsLPjbd(Jf<=m6Cc*NBpo$i$LVtK_0oAjM#0U}&OiV6JOu5n^a$Wnf@sY!2iC8L7*b j*1&auH00)|WTsW3XfU)gHMKG^hG;l&)S7AXP9{SDQdC+A diff --git a/res/drawable-mdpi/page_hover_left.9.png b/res/drawable-mdpi/page_hover_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0d537e6cbbd67b2ae4162c325dcf2aeff15d630c GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol)0U}ME`OX0;mSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLn3APZ!4!iK)p64GsSTcpm;~H{RI%|G%PF&V-{gCRn^Vv1+2KMBDBo h{xMw}n0gY}87$-lou98Oe+Jab;OXk;vd$@?2>=EWDRlq< literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/page_hover_left_active.9.png b/res/drawable-mdpi/page_hover_left_active.9.png new file mode 100644 index 0000000000000000000000000000000000000000..3004f9e5104fdcc6fa2e0afadcdb363a25b966c7 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol)0U}ME`OX0;mSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLn2TPZ!4!iK)p64GsSTcpm;~H{RI%-{8Q30}qY@i9-hte3;MaE2z%Q t%&ZK=%)3}*c)~m1^LR9NiYKsGGn{P`3*?yM*#$I-!PC{xWt~$(699IqEH3~6 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/page_hover_left_holo.9.png b/res/drawable-mdpi/page_hover_left_holo.9.png deleted file mode 100644 index 561d3cd31bb2059b8d7448b24bf1fe940784ecaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2858 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 IM6N<$f?0P>wg3PC diff --git a/res/drawable-mdpi/page_hover_right.9.png b/res/drawable-mdpi/page_hover_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c0fbb7da6498a1af77d12cd6cfbd269b1e7c9c35 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol)0U}ME`OX0;mSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLn2VPZ!4!iK)py{{OdU7Ww0T=m+B_uIB#&%KwZPY9=)sUQm^2+kHeo ghD(qkd;>GX&Bwx~D;gr}fjSvHUHx3vIVCg!0Dwj&P5=M^ literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/page_hover_right_active.9.png b/res/drawable-mdpi/page_hover_right_active.9.png new file mode 100644 index 0000000000000000000000000000000000000000..6d39687e4f9af8500fab130ec08dc9fb7fa91af7 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol)0U}ME`OX0;mSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLn2@PZ!4!iK)py{{OdU7Ww0T=m(=u>!Huj&&&U7m-slJ)06S^{r&Yb t6J^xcWD+dA{v@WQ{p4nJ zaCd?*qxs3xYk`7co-U3d5>u~E+{oKtAi%8O-@?LuAz;J*hAA?>Lar*34CU`9$Lmr|F4iSGcdH Wo5t0|FWCdMfx*+&&t;ucLK6U$Z8<{# diff --git a/res/drawable-mdpi/quantum_panel.9.png b/res/drawable-mdpi/quantum_panel.9.png index 785f573ee07aa17b758bd6374524080e77a8a365..b9b95064420e3dd542bddbf88268d509e72a5084 100644 GIT binary patch delta 399 zcmV;A0dW4d1I`1GNq=xjL_t(oh3%L@N&_(zhQHUbos}pBaaGUYjr0z^M-L$$$Q!iG zW)MLt>SCBC&&8xrL?>y|!3gui+l7~J{z+b5BC3jr5Frg5cXV>q(A1+w#Vd4SPTbh2 zU2-6GVSNLA6N!T=fU`unJ=6{`4la88O@LWl*LQ8(ZjCXT5`S&mZtJ?f2WBq!uj>1H zp>wKinx-^pus@ z<(m5D4som)0IVRD%PDHLkV1kyfzYYKZ delta 374 zcmV-+0g3+31GWQ@Nq<;LL_t(oh3%J1YQr!PK%cB6?xHI%y6n~3v*cvXRk|^hl7^;> z+Lk-GVx5El!ecYn#6w~K88@@l!3I5 z4Nfps$^h2KYzko4G|iJS=4`E%l<52Z)HKaAunYW233W^ZcYkf$zF2Fk)cr*%h1U95 zmgOVx#s6KC(5F$rPDGNWz-^o&QsFu_+LVx3;l+}rF8ErZPdRBa>jlJgC~wj#TR<#G z%JN^7Rg10ijFrJjF_uluz(AOFWoH!w|0Wfu4?~O4Z ziB8gW-SKcZ>~C@R{?P|XXxA@*d*A`6a1W9>C&kZ)$UE=~e2&R&0tE-$-TdT#Z)b{K zYW2X`*G%ddxUOx15_j`V5wk$&1(U@td8r4!{EAE_b5kf0L8;&_aP8$iI-rQ~4IRhD Uc8XGH=>Px#07*qoM6N<$f)_lu-v9sr diff --git a/res/drawable-xhdpi/ic_pageindicator_add.png b/res/drawable-xhdpi/ic_pageindicator_add.png index 9659e6fd8d49f46a916a86bac146e54a92964e12..af1da2d420f83bc477a6bceb0527b3e210e76143 100644 GIT binary patch delta 1069 zcmV+|1k(Gd2B--kiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>m!Ue*<_) zL_t(Y$Gug*Pb)_d{${;r8)O?}1ObE)VCFZIe6IqU($_L(0QO5O5K>CA*3#f@%#8j0{p>i& znM{axs1wE*K}4jr&Joc!M6_y*`3eAr!=V_*5VJt!49*j9(d+dDfRyk1f2oA)FboL* zI-SmB;ORc`Gyr9@S&E_v+uPfz#l=P0?RLe&!h*cIx`Ng^om6a$afnFn?d_#EHa1YH zR7@Plqtnw`3+F-Jr? zo6U+SivC<%Tl>9Mt5Lh%wqY3ZWCa9393LNNnHjF@{t$*CE2Uzk6f328Fc>^*ayC}2 zlw#lae`aPho6StMT7AA*FPdzO0RU*NbtaR6wRVu$5Ro9Fc>u81e-4>B9tSZ(hy`Oz zH2wx=#%mN&u~-zI=ZQw6u~;gV7N4G;Qt5PBUSD5FhlhtBc6N3?3L(;WcX!{{>-Arn z&1NwOf;gAUnJ9||u`ef0Z%p|u`5j`Q37{r$&JpFUk~Zf*uj zDck9E_$`pn9XJ9&dV*2|Ku^#!6X4yEDW!z97KK6qwOUP-%VkI@M?nybCI-$-iauxP z(+pdlvHySNe{V}0;=r7nf=vJb03~!qSaf7zbY(hYa%Ew3WdJfTF*GeOI4v+XR53O> zGBG+eFfA}QIxsNx!ht#f001R)MObuXVRU6WZEs|0W_bWIFflYOFgPtRHdHY-Ixsdm nF*YqQH##sd*|nhl0000PbVXQnQ*UN;cVTj606}DLlMDkL6cON| delta 685 zcmZ3%xspw>Gr-TCmrII^fq{Y7)59eQNDG262OE&I&UODaQL(6=@u#PYV~EA+vy<)n zZ#f7Yz5nLc42cQ4PLrD2E+~ko*s&cIEm`6cvZU`wd54guZLHKS7S5MiT(2}tIC;-@ z+6(c$Xp(V%zO{CnIj_6VyBGPhuAa$q%fI(etU||;Uv%k|lT+l+y}030Qs=S%e*Fu- zc_%NvEn{Tx+H~50$D*$}seYr!u63WUW*v=QdyQ4lcBYTo{M!5bO?i}WExhdb!h;v%ng6Hh<&;Ba)} z*m^PJip}}zxRoLI3eUx#dH&hFYtf%Me#`C6X7`5cO@DkhPu+hCgTvmq_GOth^?T!1 zFAaKGyEbfhNa$D55nYZ6g<5U#6Y_fT#&$I2R zk;a!z;+YoQ%=vb4+uPGmiz=u3Ew4TQ`H=z7Q`=}B>~KCxoeDq%tH zrUz^Xco`m!Ue*?ft zL_t(Y$DLNsOCw1X{$5ololR!gA%a09nH)S#oP!=TLXy8B#Jh{kE_hvX*?(dekNyF3 z@unz*5j+`BVS?${KkZJxJ#6=q#Egb{P;_;5_4mE^s=il6nBQpXoqy)1 zS>Ioq!!ME13*$sYU}j1r612Fue@KZ$f&jpA9Pagc>^Ke+5i|3vMAN`R2q6I|<#JiA zR;x)NgbE-IATESZtJP|`tAF~ltIg%CoiR4PekMyJ#HBLXu`(=$!e5Bovb z_aee}yZt*eqf)6Pg%HZve|k(Tt}GUdDgb$Ye!glLMnCl2AM<>=`Icqz<;Z1&w?F!&aFKYGFYsEsVk;=y2WwY0SK4uBeB2>|qee*~e3xLU2gky5@7 z#q*kq0f3kpQp)$WTI~%0js!W8qR3p=6_JYPwMg-f<2=KQ2FP(720+Kh$M)0HQ#Tx+ zr=T$ac%IiiIy$n)u_6Knz?!CUtyYtorakDo{xyssn1di7BIvsQwcqbQY;SK%P1B;f z#8Cw7x-NIS-2g!BfAsY9v*&pOB2r!<35ZDXJn!M;u&+1E-x?ZmSwSJS%F~~ez>C|p^Xf~@GZ*xHws|-l8qH?24j`S+=hH-_e@>T*XCh)|42MI`X0z)4 z{{EGe@;sZ(dhvKXK}7K&2pq?8Ztw5!j}HzG{@UH${gTV&)9rR$BJu%5;CPAP84)uJMNwobl~NQ%Apr1w zpH0*BecvCAc|B7%^BnrobJnfmhrmB;^V~8f>|crXY?%;}*vGBG+eFfA}QIxsNxG{S*80000bbVXQnWMOn=I&E)c oX=Zr%HaajiIx#jaFgH3dFxj=B{*yNYF*#NWH~;_u delta 684 zcmV;d0#p6)3FrnPiBL{Q4GJ0x0000DNk~Le0000T0000T2nGNE09KP{50N2qe*!p3 zL_t(Y$K}?)k4#Y%!12$#*=1!L|G;WQtr4P=WUU*dk_OT!La5Mp{l5s9krDxKR4lr+qf2Ec6-^M}Q zOuAtssWE6&-L<^KE@dwDTfynn?iPnPwTC!@<(8mkm8jfvp=irA+Q-#JG}y(kHYN8} zr64-ZpEBiAdJm?$ZkO%(ROic#w4c>3)k@cJT?1!cW^e&9l9WH%43AZY1n) z;X?{wIB7?UC_m#0wv4v6X);h3%^aTKwt6ndPMRHPrtBxsn)u2lcoA5Hwt!>Kq^uT_eoK95%l?gB;AVohz+m!Ue*@)7 zL_t(Y$DNi>NGn$q#=moBGUJ~|6Q>vrC=UV#Ueu7KieMB3&5BB8Vht{*}C#NoMZp!buuqp2|DBx%b@fch2RzhatQ? zsOwuk=TNWx=W^sJ7(KDx+9Sg-e<%I0Q6Wa zW+s!#0U|O17yt}rHj~NZKr9wB0q8`e5fS(5SnCE55sL^LhQV*%yfJdQoU^#NXkTAn z56;ca`D3xzfNk4qety2XzrRo6aM&o9%i_8&5fOEFL0#ey5sjI(si`UbfBgLX>e;>pQL z-^Im6ZEI`mn?NA&BQt*?_orIceC4g{08lEG-Y+aH{2Y(R2U4k2Ln+nT7p()p z(P&gprBY4HvL?sJ$A2fHeosvI#Hj<3`rhvD?(VIxujixDsD5*E({@y=BKUkh z8Xg|jM8pk;!|#~c0^sy8LbpjAX12oN@H-K4gTbKY^ZD9W->%BCe=IsYJak7#M+1go z%y#TQ7YqQVY0d_N!N9@6fooY-t5a$V7=}RrB$-UU(lqV0=Y;28F#wQ=fSF$>5{Xv; z#M63M;k|_c+qPLmULyPm)ND2%b=+DY+qMM&9UmXxIgXR{fG-(nLPT&JCwp{sbO(UE z5kf710FY9tB(t-#e_F9vELE%3V-KKS08m7PYPEV?sZ>gyM$1Lg>OdNehU9WN1;BTD zdiud}oH7yV&p;Fr>5k)+PEJlf0Py8OJ$o|&1s85$aTt7)3q zO7H^A%&zO!(&_XMOG`_?hC(4do6XjVNO@!B5#YWw5!7lm2?m4a=H}*Kx~}gBgTbb* z>wQFIh)BKBXk>10Z+CWfcD`R-UHx-pWJJs7^LHZRbc(mG23=i{h_J5fhGkiU#bObT z<0!x1|7AEFf9?l>OeS+zsZdOIADmC^F`FPAk@SGmrcGjIp|z9pM~Qn4T3hxovPth;qqg^o!EO;w#<_c5y_{#h zzP`NR*Tjh7AZcn;UJg&%uRcjD(l-m z65akV{KqkFJ1^I(9Zk|Y&Gid<cqJ2QnQ3-LwUXiWKKZpyiFH%iDeeL~0 z5&s>>#qVu6`{;M7_32~tp1zOi`^&7g(N*$Q!nHi0$5l&QBT7;dOH!?pi&7H9tPBjSjLm^uAR~3z(i#*Ux%nxXX_Y7%46RH}txSv|8V($_W}5tj G#Sj3K9hS8K diff --git a/res/drawable-xhdpi/page_hover_left.9.png b/res/drawable-xhdpi/page_hover_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9b0def8bb6323df13b850a37e281f94982861e63 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^oIotg!3HENuDQ(xQY^(zo*^7SP{WbZ0a8%l5n0T@ zz}*SLjOHg#uLTNvc)B=-So9{RG&KC@SHK3qP-!m`jQe7b%MzZG6z1{+}p&!a9mBMeqX}ITA-N>p00i_>zopr E03t6hcK`qY literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/page_hover_left_holo.9.png b/res/drawable-xhdpi/page_hover_left_holo.9.png deleted file mode 100644 index 4972a2eebd6ff2f1d99f1cec534ea6d0e3e285c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2956 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 P=z0cES3j3^P6lA@mZ zTV;GCnSulgK@rXcwUtREO5h}l-d7goD#?^Ua$=lIYCDrO3PG}bRS5sv@kK~Z4B!gD zAWhSES(dG&lzXL=ZgZ1T?z1dgrD=KtU{J3P7GD$r!*R3Q?3z);RT1ilaQf2Ot41>jsq( zOM)Us`eG~Nb9JNc*1IG*CPrL66tOlg=_slLlFaEzWq*9S8_Ey$owYYX4<7Tj5Sb)8 zkV)pnrZT>nL;+knUNMH~DqYDW=Vn4=(yNChS-_GkU`ZCRBnu)md?Tuha3)#6k}PnZ zs{c=LCRxCeEMQ3%up|puk_9Zu0+wU}OR|6^S-_GkU`hW*up|puk_90ob>XI+SB$Qb zx*#SPK7X0iMNv*M`*t@CKq;l}J=>`brPL0dMWsI7?YM2X+m&kob+g@Wf8adc%J@oB z0Muf!_$;Nob!@9Pq?EUd#o`k@OO#{B&!>Ci5rF=3xxCx&_unRy$#^&%j)f3?$997t zrM%m0Hs9y-`N!F8_6xuRfE=g7(n`2K1fT-<1b@H~z^L2?D2h$Z3~lN`gPA1?MG)f95bln@nFbu;m48t%C^U4wYeYmGnlmz+;K S4exUR0000#Wql^#AgYa)WW=-}_ab9j7f8=xHg zBVbrBsH|8blrcI_PkiofX5gL-Nsf&b*97~4TQ;r7RezE_Hws4}$-c8So-6rICIbM| z5lEWCWB%qcCfS%PGjzP-^qp}7fEYnb^16_|E$P32B@tjr1XvOQmPCLh5eRVN7g1w` zTM_}5M4<2Y(W8J{5&@P(fF%)NNd#CD0hUC7B@tjr1XvOQmPCLh5nxFKSQ3FYB#q&v zomY(9l79&JNE$;6s^b*1i==vfv{Fj#Tn>H;lu}z9CY3gl<=T?$3|GC`Y?hAobk1h8 zc|a}RrgivsHw8e&aeObOeDtWR6Qq=naU9>nGetS{h~YVJalqYY&Lr< zgz%}?7bT_Kt=H>^ySuwjx3{-H0Hgpilo_~9@_!`(;Iq#^0Zgvs48Xi9CTIHCT9YoR zk2e}+5@`xxTa_L5q8j0opQNh;<|s2;e`B9&*H?0vJ?@y8OxA6I9@dtaexBo{paNw# z?n_cVt_*Ie$VG0RU7e zj*y#-vA>{*l=*Rxoh>88aT{kF0BTc}SN!E=IV{4>VIQdO)%_q#^a32+oB?2M1%Pu2 zfMr>UGXp>r9)MXt07$X{8e#d3u4GvQd2GJ}1Xh1paZ5$ItioOs=I9wA3mpG}{qs|M z0Fc+9KsHp5_8t#shPuPL^X?XerU_}=O*K!14VHVI_};cI+_uxGbmam!d9Cr_igp7u z4wk~kj3C8CIk-s*?hJgIqcNP;&SKJ|8}EeA3t8m1{J|;P`{ucYIdijvV)w&`*Un$w zune&+@5V5ShK7Nb*hTu} zNE5SF!fF}txwrK3qQcrK*vw>i*27oq)shW7Z@6AV_@tA%ovWI4{it}aE(%HW-o4YO z`P*hdqtT85eNI~KY-z7>-N4X#&{cPpnh9!nw4mDYFk@is{4)JX`)x3AyxrY8wlI0A zFwv2ksq|eatZ8b}0b{uC%6^CK(Wybd5wBz}_iy%nd)ADAzR@OZ=)akcWut-3&7euF z6H?0|K+SztO^c)|jJZRExext@bCIO*pDVG-?JjngNChdmIV~)SQ$6kwW@s?R{<%{{nM5Kn zE6gAaBq1EGZl$C#Lf9b<*RH9+# z`wD-rC#KxMQXW3LdT|=9S2jK@U??n!M-MWY%vDtUm=S@kGw#PP_CpI-3b?q91e#d7 zmu_kN9=GXmBDd$$XvM*zpK*&*Jt7^e)AJJ@sj1K+B@G4|M@%&Kd^SK!y>TMjvM(R@ zS-|x$3v%UIh8U&V(VEC_vqPMsCY1Nq1A|EPeo zzAu!)*@{+HR;!BfV_ws`RCi$rc|F=cIQT;r9(8YHT3KFR9vk+$YmsbDFu)jKHlPh| z6&M{X#DW>ou;9q?iX*c>GW|w9hvlnaoQ9Y=KvXDJE*}0U*{qsitAj!|3Iu}lA751k z0W|0PEoYrJZ~xR}R!Pk^er*S8pk(W1e=eKcCtX-rILsT;yk>uaSI4X4&Yv*9WnTir zB;9fHZH<$Duve!vcHgFT>37CqMV%4X3LK)U0ZyPK{9_$`+=_(_a5Ve<-h~ z9Ny_wweck9K0NSb_3xBAN^#ev0+@%o9RL_o+9QO`80;JE&NB;3bwWN=zU)%w(?vvX z!ywzJe1x~^r|dVtL-Wc+sfbNXq|2Kp*4DnTFEK@8F(OQ@0_QR@WetZR7>-&cqlI@l zDfmomBFu&U;IZGlfR_@vH%r7|Fjf^fOJBe8_7E0tPvAQAwufu^Paz3bjU%T6@S54& zZ!b<{kfzNr3v`+!FQ=Ejg=Lalvn8tJU4h(nxaPQDP9F+MEC^($8#AkD$vF>SKj<`~ zyvvWUr%w45iI3Y#AXn$9?hVY@2x$U*yNz?eeEo`)xWDz#>iy+gU8@&2T@^b?iN|DD z(=gJ`BQnrGGKdrq9wZ}RhBr0efhX?3TT)FeNoJ-b3;Yhe6$y`*Jh?#nk06wR2@Iyk g{!f9oB$-+NcJ5lb_by9eSYzO1M3gM=Kufz literal 1370 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij|9#shO*h zfrYb^k%^gwp`nF=g|VxXfvd5hv9qO-u_eq5YZIEG{rIcd@W=GBY$XHZp+u z+|t;<%*DjW$i>*vNC~Ppg`7~+2RcR{lsu4<3rq-@20=`C;sF!N5T$fwHOGPs);V#a@6_btCh>=dDWlv|Eea(>fhup=^gqXvEIF`%suT(%fGI=@{*TrI{RiVo9NEiD=p@2 z{!abePSefX^_Z+yvM}7?v3<3x@BE5Z%L7d;zGv$XJ`7}K`4Sh*wa%_=#_59Cg==pg z+hx&b|7w@r)YISpMk})DpWc*t`&;@Cjgps@ar@1cV?%PE>U1qizg{XoNyYQ9!J5!A zhohz0ZXrA0DsUVqoU>1(Yvu6;o%*vUYZos2X?0`9)TG-Jw&p4bzX@b>b2#?g=Dg)J z*O1UutK~Q5aO6*0pmX}3!RqrSzWaF{pN1LD=t$7EGG42`An+f*Vn$5$(VL4mb8;{U zG{nBjWnwmBZ~NV}=ZOaU+9{K!oGWp>St|E3q3276=n1)NGrda0Qn)Alc^`ctYe76C Z8$)^cW=-Fge`i6Zou{jx%Q~loCIFuX;&T81 diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png index 4e4660fd1ad339ccbb92df5dff67cf3f2218366c..b74e92ea73ff2f55205e80da5275fec369f1f8e3 100644 GIT binary patch delta 1685 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 UIx;pbFgH3dFyNGR;*(bbF{%+QX#fBK delta 479 zcmV<50U-XA4u}OIiBL{Q4GJ0x0000DNk~Le0000Q0000Q2nGNE0I5n$&XFN?Da7HS$0CXx z$5eels7HztU7vGLu79p!kH3yAm1wOE@f%|d)>@1)+Z*`=*4i9s^mO$Z;DD%E7Bdk> zK&|gnz-P0-TbI*kmJgU@N-zbke}NV7s^<~7(pc?(x}}X*6sY6^xKY9oD&P`$h*g&N zh)0_DDNyLW_G=+H#o8PvZQ9iFv*=6UObI6)ey-SBoMlHlXykX%2{4y%Oh3lr%%yRm zCCMWRj(}ML&yUT3;~`QX8qyARM);g18GQgR61xb`iSsN?vQeY>J8-AJWc`d7eTj1~ zjqf5!75V8ZfD$;Me|t~FDLUFDqgrDnuwZj2`?hx_PN`TON*HwSw4jE~VO+4;!sm)V z0k^88YH@@8ZkwihDBZ7`>Q1f+V~iWRlXi0P?eRbG4KDe7b@Xc3xs!ng8b~)SF*sB) zGCD9YIx{ydFgH3dFlDBtd;kCdC3HntbYx+4WjbwdWNBu305UK!G%YYUEipJ$F)=zd VH99miEigAaFfhQyI|7sA1~FTL$RYp$ diff --git a/res/drawable-xxhdpi/page_hover_left.9.png b/res/drawable-xxhdpi/page_hover_left.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0c0eddda1733a3f9fc08a45265372b018a4f199d GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp@K&;Kd1|%2DF@*yumSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLrlFPZ!4!kIuK(47m;^@U%T#9;IRNjU{eD`^&%L{ug35{E_WaP~D%@ z{a`{lPo?LHPfIrj9WlA>q`CE4d|=$c4#w$G|1~w@Em89ZJ6T-G@yGywo4B}X3s literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/page_hover_left_active.9.png b/res/drawable-xxhdpi/page_hover_left_active.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a9ae222222d052a249fd6839c81fedf5d6d2ef5c GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp@K&;Kd1|%2DF@*yumSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLrl_PZ!4!kIuK#47nN%cwFOMUJAz8PF`MKB4*RTacm*i(vYS_JD&8; z-=h+(wj|X_$Fqi1TnXQz}(e9%Naaf{an^LB{Ts5IJrkj literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/page_hover_left_holo.9.png b/res/drawable-xxhdpi/page_hover_left_holo.9.png deleted file mode 100644 index 626aafb55d11d587a8e1bc9bfb9b3f37bebc88e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3026 zcmV;@3oZ1CP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0002}Nkl#Nx`%z@_9rO_Wo-?P4#;1GVdh0X2CuK#S%OMTL1)b(LsZD)Skd3-{3~48+2gM zekkB3?f@(R+%)N~ElIzkMbML!%+BrsoXnJm$)_Ntb9Q?LV5zg{bp4a^z@-6M1NNn~ z5@?|+un3jF*=k?|8`!`GR)Ntw7w5oX4)(y1z(0cz?ZHd+z?%W1=Kut7(4*~`I6yGg z0pkE1<>9R9*Tg!4mpCff+MIjV>Hq)$ diff --git a/res/drawable-xxhdpi/page_hover_right.9.png b/res/drawable-xxhdpi/page_hover_right.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d61f94f9502a3c936ae86fb884e18d3f8aa6025c GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp@K&;Kd1|%2DF@*yumSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLrm4PZ!4!kIuK(47m;k@UT75cP-GDJHTBr<6iws&O6*kcUW{hcpS+c z`)U2j?~@HD&QxLwieFTmzr4o!b(8e68t$TuDRT`U{j$th$hchmo!i-MPOV&`S|Km$ qzZ~d#D!%1GU*&02cC~FaI{p(XWX^7K%60%+%HZkh=d#Wzp$P!h+(bG6 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/page_hover_right_active.9.png b/res/drawable-xxhdpi/page_hover_right_active.9.png new file mode 100644 index 0000000000000000000000000000000000000000..079ee1ef17afc96de718ae5aa421864bf8c34837 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp@K&;Kd1|%2DF@*yumSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLrmKPZ!4!kIuK(47nN%cv>I+?|j6_A{%SF_xmRfB?pY#V-_};u4X!OSM>(zokAJ`3mh7m ut}Yg~XxQ6w$$JO0^gr+a$5%W%Uc_jeBb@#Asgx|xVg^rFKbLh*2~7Za5kwjQ literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/page_hover_right_holo.9.png b/res/drawable-xxhdpi/page_hover_right_holo.9.png deleted file mode 100644 index 66257dc8ed47ce45b14c9a4c3b603316a762cff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3015 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 JPDHLkV1ntQm&pJC diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png index 035cdc4ad86ae9c2480ea0feb5daa5edd33dcb79..4392aa02a205d531a5a5c53fabb4da0aa6120fc3 100644 GIT binary patch delta 1264 zcmVF>C8q6vzLPtj2HflBGkSd4VilI&^=OKw{O^2A$sqhFSgOfUawk6#T@{LdKli#DsJ+_Yh z|ACM!98359bgpE{IVW+>AxRRn6t|-7wzosvs=9;_LI@#*5Pw1lA%u|s#WL@)wf25q zM3!=6P`e|WK7ZZhHHlJ{*U|j&fFziQ%a&Lq#jj7^@t!B6B`p+`h)J#wm#yF$=I;|3 z4UG;9Makt*p4L8S;(}!JmPmlc%0uf>eC@S-CFkdH>ApYuHb6sU!jWf^gkt0zrUWLX9P zsH*C9x7+;~b(9r&I7IrWdor;iExdBPA09iM&L=*~)=d~tABbsMe}hSqjtv0NEz|A~tAahC0Fu%=;s1C&Z348DajY z+cYvUsYIOm)#C<6n!F%W86LIHY5ub{KfkT0w_EF+=68Hk&uRYjpb~MKN5neZ6n+d% z&kUooiNn`2P(4^RpQj}Nk_{Xl7d@em1|!WLjx*8>LTLt}G=or@K`6~2lx7f0GYF*_ zgwhO>Vs-ha$RlB-8HCadLTLt}G=s?h86!quq>}^#Cx4V?kA%_;LTLt}G=peL+vML< zsid{HkPz-NAJ_W4u`{E zBWiZQ`r9Z%V@6tIHHg7r@Dny<$h^C|`xDKgT7OOhguH`;gC9qu(H~0N zX%%N@XMaCHDHp#)@^)Isa5y|WK0f{h4~Iq-aWT`?hIM4_)54yd zocy)Fzdz`9yZ>x$ZT0dz@4@&#emLifq9}$}S69ECo}PYlbaeFX_4V}|0Atjt-6yE? z7@MeokplPtz!rdKv*l;AsRJO#dSqSo(Nv%oG=Bl`?`)a?cr%;(-27n;nnx2eb)c_a z1k8ts67%vMCFWu~Xg>1V8hwjONcybcvWJ8 zZ3^X~5zsB(6CRCHnv6ti(!v`E^5Uw3qAZVghrO%%?m9$TQ!!WdXNt?{utjyRm$?tI z3B`oxI#rh0Vb(=0LiK?sA%qY@2qAzium45Ql%eYvUVSClp9Gq`(!SprAunqTmg9 z0m{&lCx9wKf-V(RkNtINHNGTG_xiR+cp*SA#v)wSksv;oVKVn>{ddEvs; zC!$gS>FMd|2YY*a-(*?#X2kt9hCI*zIzK=Eq}S{H2ro_+ht-pmhY(F#m>NY|Cd+s{ z{w>S0-AMatBzc}+bUK}P0p!6Vvcj?Nu{fgc(K2~{{y_FaE2L`n2{EaUnzW)wMV1T_w9E3J-`dg^E}cnn?aUk zb8(Z&r>2EhKia75Bqrg3W&pBH_(g2#93|6Cp(HMLq=gYC zYYZIT-LK0vz{&TV795R_6$ug8?5K1!$r5S|M3_@uJp)`X~ znn5VdAo2@YVhBc>K`6~2lx7f0Gf4P9W5fuIll}rBlL!M9f11)Z`A4v-=gvqoNNj1b z%HypAYS%y`(kN^}%-Y3sw9}(=&P|l}(HM%NxJ3&#zWzyJAC2VZ=H_Rt zE`J+EXiRC9jRgAr{#V$Hl;mw3+rwBaiOZ2@>4z_ZKC%Wu2g?mLn8 z)ksF8(eFDue>)!oxC3wt;3a%@RjFkht?+cLNDJRpk{agq=}%5hJ|7N;e_%Z$&JBmd zKl}au7kITMf4QMT6k>P4kTS3>0MFo~tpgu%TZe~-Zyy{Se7e28{eF@prVCQ%d46|w zb@j{f@$vD|(a{-vWZeQ7&mP~wM_GY|#27?xTav&Fe`~?Z+5+&}Y`rymzK!*$x+^8m&hk|LaOt27GmSv)Un&fklHi3_< zu(^Qc%BvzmWQA)ZY*zt-3ldm~~NAJ-B-w6G8|fgb+dqA%qY@2qAt0Of@Gl1bzgSA;WhVdt002ovPDHLkV1fh;aIgRX diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 93006b3f5..89473c8b1 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -72,6 +72,7 @@ public class CellLayout extends ViewGroup { private int mHeightGap; private int mMaxGap; private boolean mDropPending = false; + private boolean mIsDragTarget = true; // These are temporary variables to prevent having to allocate a new object just to // return an (x, y) value from helper functions. Do NOT use them to maintain other state. @@ -367,14 +368,6 @@ public class CellLayout extends ViewGroup { } } - void setIsDragOverlapping(boolean isDragOverlapping) { - if (mIsDragOverlapping != isDragOverlapping) { - mIsDragOverlapping = isDragOverlapping; - setUseActiveGlowBackground(mIsDragOverlapping); - invalidate(); - } - } - void setUseActiveGlowBackground(boolean use) { mUseActiveGlowBackground = use; } @@ -383,6 +376,22 @@ public class CellLayout extends ViewGroup { mDrawBackground = false; } + void disableDragTarget() { + mIsDragTarget = false; + } + + boolean isDragTarget() { + return mIsDragTarget; + } + + void setIsDragOverlapping(boolean isDragOverlapping) { + if (mIsDragOverlapping != isDragOverlapping) { + mIsDragOverlapping = isDragOverlapping; + setUseActiveGlowBackground(mIsDragOverlapping); + invalidate(); + } + } + boolean getIsDragOverlapping() { return mIsDragOverlapping; } @@ -946,6 +955,7 @@ public class CellLayout extends ViewGroup { } public void setBackgroundAlphaMultiplier(float multiplier) { + if (mBackgroundAlphaMultiplier != multiplier) { mBackgroundAlphaMultiplier = multiplier; invalidate(); diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 80f8dfce8..72d33dae8 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -96,8 +96,10 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang setOnHierarchyChangeListener(this); final Resources res = getResources(); - mLeftHoverDrawable = res.getDrawable(R.drawable.page_hover_left_holo); - mRightHoverDrawable = res.getDrawable(R.drawable.page_hover_right_holo); + 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); mBackground = res.getDrawable(R.drawable.apps_customize_bg); } @@ -850,8 +852,11 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang } private boolean mInScrollArea; + private boolean mShowPageHints; private Drawable mLeftHoverDrawable; private Drawable mRightHoverDrawable; + private Drawable mLeftHoverDrawableActive; + private Drawable mRightHoverDrawableActive; void onEnterScrollArea(int direction) { mInScrollArea = true; @@ -863,6 +868,16 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang invalidate(); } + void showPageHints() { + mShowPageHints = true; + invalidate(); + } + + void hidePageHints() { + mShowPageHints = false; + invalidate(); + } + /** * Note: this is a reimplementation of View.isLayoutRtl() since that is currently hidden api. */ @@ -883,25 +898,32 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang super.dispatchDraw(canvas); // Draw screen hover indicators above children. - if (mInScrollArea && !LauncherAppState.getInstance().isScreenLarge()) { + if (mShowPageHints) { Workspace workspace = mLauncher.getWorkspace(); int width = getMeasuredWidth(); Rect childRect = new Rect(); - getDescendantRectRelativeToSelf(workspace.getChildAt(0), childRect); + getDescendantRectRelativeToSelf(workspace.getChildAt(workspace.getChildCount() - 1), + childRect); int page = workspace.getNextPage(); final boolean isRtl = isLayoutRtl(); CellLayout leftPage = (CellLayout) workspace.getChildAt(isRtl ? page + 1 : page - 1); CellLayout rightPage = (CellLayout) workspace.getChildAt(isRtl ? page - 1 : page + 1); - if (leftPage != null && leftPage.getIsDragOverlapping()) { - mLeftHoverDrawable.setBounds(0, childRect.top, - mLeftHoverDrawable.getIntrinsicWidth(), childRect.bottom); - mLeftHoverDrawable.draw(canvas); - } else if (rightPage != null && rightPage.getIsDragOverlapping()) { - mRightHoverDrawable.setBounds(width - mRightHoverDrawable.getIntrinsicWidth(), + if (leftPage != null && leftPage.isDragTarget()) { + Drawable left = mInScrollArea && leftPage.getIsDragOverlapping() ? + mLeftHoverDrawableActive : mLeftHoverDrawable; + left.setBounds(0, childRect.top, + left.getIntrinsicWidth(), childRect.bottom); + left.draw(canvas); + } + if (rightPage != null && rightPage.isDragTarget()) { + Drawable right = mInScrollArea && rightPage.getIsDragOverlapping() ? + mRightHoverDrawableActive : mRightHoverDrawable; + + right.setBounds(width - right.getIntrinsicWidth(), childRect.top, width, childRect.bottom); - mRightHoverDrawable.draw(canvas); + right.draw(canvas); } } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 53a3f948d..a6cce9346 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -585,6 +585,7 @@ public class Workspace extends SmoothPagedView CellLayout customScreen = (CellLayout) mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null); customScreen.disableBackground(); + customScreen.disableDragTarget(); mWorkspaceScreens.put(CUSTOM_CONTENT_SCREEN_ID, customScreen); mScreenOrder.add(0, CUSTOM_CONTENT_SCREEN_ID); @@ -1583,7 +1584,7 @@ public class Workspace extends SmoothPagedView private void updatePageAlphaValues(int screenCenter) { boolean isInOverscroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX; if (mWorkspaceFadeInAdjacentScreens && - mState == State.NORMAL && + !workspaceInModalState() && !mIsSwitchingState && !isInOverscroll) { for (int i = numCustomPages(); i < getChildCount(); i++) { @@ -1592,6 +1593,7 @@ public class Workspace extends SmoothPagedView float scrollProgress = getScrollProgress(screenCenter, child, i); float alpha = 1 - Math.abs(scrollProgress); child.getShortcutsAndWidgets().setAlpha(alpha); + //child.setBackgroundAlphaMultiplier(1 - alpha); } } } @@ -1685,8 +1687,7 @@ public class Workspace extends SmoothPagedView updateStateForCustomContent(screenCenter); enableHwLayersOnVisiblePages(); - boolean shouldOverScroll = (mOverScrollEffect < 0 && (!hasCustomContent() || isLayoutRtl())) || - (mOverScrollEffect > 0 && (!hasCustomContent() || !isLayoutRtl())); + boolean shouldOverScroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX; if (shouldOverScroll) { int index = 0; @@ -1710,14 +1711,16 @@ public class Workspace extends SmoothPagedView } } - private void computeOverScrollEffect(float amount) { - mOverScrollEffect = acceleratedOverFactor(amount); - } - @Override protected void overScroll(float amount) { - computeOverScrollEffect(amount); - dampedOverScroll(amount); + boolean shouldOverScroll = (amount < 0 && (!hasCustomContent() || isLayoutRtl())) || + (amount > 0 && (!hasCustomContent() || !isLayoutRtl())); + if (shouldOverScroll) { + dampedOverScroll(amount); + mOverScrollEffect = acceleratedOverFactor(amount); + } else { + mOverScrollEffect = 0; + } } protected void onAttachedToWindow() { @@ -3242,10 +3245,8 @@ public class Workspace extends SmoothPagedView setCurrentDropLayout(layout); setCurrentDragOverlappingLayout(layout); - // Because we don't have space in the Phone UI (the CellLayouts run to the edge) we - // don't need to show the outlines - if (LauncherAppState.getInstance().isScreenLarge()) { - showOutlines(); + if (!workspaceInModalState()) { + mLauncher.getDragLayer().showPageHints(); } } @@ -3320,6 +3321,7 @@ public class Workspace extends SmoothPagedView if (!mIsPageMoving) { hideOutlines(); } + mLauncher.getDragLayer().hidePageHints(); } void setCurrentDropLayout(CellLayout layout) { -- 2.11.0