From a29f5047f004062a9fcee5fb8a4b90fdd56f7d0a Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Thu, 26 Sep 2013 14:29:35 -0700 Subject: [PATCH] Fixing overscroll with single page (issue 10937081) -> Also fixing asymmetrical assets (10951956) -> Also fixing camera distance to improve overscroll effect Change-Id: If229c7b8a0c80073f6dea89d5fb009a0e2f5845f --- res/drawable-hdpi/overscroll_glow_left.9.png | Bin 848 -> 858 bytes res/drawable-mdpi/overscroll_glow_left.9.png | Bin 547 -> 552 bytes res/drawable-xhdpi/overscroll_glow_left.9.png | Bin 1236 -> 1249 bytes .../overscroll_glow_left.9.png | Bin 2800 -> 4562 bytes res/values/config.xml | 2 +- src/com/android/launcher3/Workspace.java | 17 ++++++++--------- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/res/drawable-hdpi/overscroll_glow_left.9.png b/res/drawable-hdpi/overscroll_glow_left.9.png index 782ecf1c628223c6da7bbd8157e472d7ef7c1460..aaf43c73ab38f09244325767109396fb496435fc 100644 GIT binary patch delta 798 zcmV+(1L6G82HFOYNq_uFL_t(&f$f^ht`ji~hQIV8?h8Nyi8o-0#1fv6XGLPirZYZ^ zHm&QiolK8_9%d{>N$kYq*niT>Nf8lBDFh^uV5KKTZh%E(Di9HXO*H8dbWdRVr?!+* z?!^~!6=V_F055>oz;lj3=vEfABVIH<(<6;BUfa_#NADc{w}04@@jY3Oycc8_0GxLI z8{jkW75Kmr0GR>WnPVUuP2ZN$(G$sgWYPGsF+Q7rt89+_UO)0x=1(g-_nn`5*{RM3 zcn5q3e%OJHwg-sR7;X!^u5G(j2B#j3d@%BZBdffF!}t1!glBaf0{z;K%qF`Qz1~qo zMvg!@$4~>H0DrH5Pp5XYvuis-qQ|o`Z`Wi&j{u-$gR1qofvIz}lf>ag?H144q}N@2 zT)3R9Tjgsl8%}lo&YtVQd$qSlUCK$vFJ;da0ATv(&pU!}78o71t+p4yp2c{9^U$Bk zyj{`)Kz3U6=#18ojdpGi z0PGRmYmXQ32;e;>I~}9bbdRAq|MH&-Wq+dVkvwNkGCU?a2v!stWyezv{6Fq{T z@W~QO-hVe+cIm{Dw|1K_ic;NP0;uvUZ;!L#Z7SF%D|Fr(Q+s)TlmV?QVk@&4<^Ho& za?5EwnZ=&;a0>+9g-uU3F$1UuO0=G=)VqKy(f|Tb5_VG>>sNOW**Ke}IN z0iy+o-ZXI(I9syY!0oAD?^bH5R5z9OZ!H=mR)4n#9u2tYl+v;*vhM-j0$+e{z(=OR zhdijQoezFsZwY(`h>X{Bx@4!$-0#e>Kl6#^lZ>_H92@UFfPE3P<@hM%J@Aqvl0EWv zzc(fuXXV+PR&D2cr%+3O@3-dYZrPdXpTi6Jjh8_(g~a+M@Q>0Ry$1x4a(WefPe!fu c_ZO%<0J!!_DNJge7ytkO07*qoM6N<$g4JArh5!Hn delta 788 zcmV+v1MB?S2G9nONq_Q5L_t(&f$f@2t`ji~$A6iYkD`YVLV_!>geBr#fO~N>&cT)? zI|LH#n8i%m)UutVJa~l}OQSe{e>9UgnaWNQ5mHJxB%WZUe~Qcn7Ljv-hyVm$9HXD8XuIb#FKi43h%X< z9~yPEJde?{Nq-`efRs`?JK1vpBw)vM{O@L?9n)vPn&6hBuw|j$h&6Oa$0k*L)B-X3 z%~sn>TI~mgYu!@c+K}Ex5TR`kw&1hVAHXBvHRs0^1@9ei-f>tvQV$9%`-h?x z2iNUE`8fo<)$R@5QDH59v_Ji>r4Kz92LrR_t>qK-0Dt(169B>~5b~t$@uM$VXm8PL zk2T3H3mpYOg!RZ<{kOEWcWr%I7G3iP3>qwOrRC5X01Kxz02WSb04$u=09ZJ!0kCjd z17P9wKL&tK&*~IzuT6`6%b2c`woHS|`QbEU4>_e+^~(>Ol0;c&AWlknNsKb{r?Y%s z7R<`>wSOdC?m7|Ft7B#VEE}B(wUS0U6R7br`I9q&W_7nr1!u#@bN@4^Vo;fLr@(48 zfm)8eHFs}eW#Quz`>0MZHjLAng9xk1JU-GdDXJ@MfcKVBnF9U>d;z`!&zKf}Kg;i; z8mRGTa$3f-dsiVsb$B$ckQpd5tK{7H%y;_o@Lf1a-FUZAA;R`4|qYNfwN=@+J6R_K_o Seho(e0000oL_t(oh3%M2PQyS9hQCPz6^m}T2dvm|6VAb@*|I`v9%hk@ z>Kf0hvntyl&5Lq%$+gRrSVu{zp z-UF||iy<*ZrnY-TrN)yP=VUZuZG#yP$~HK*z0#il-poDi#W9J<1k90Oo3XnFvb0Qz zdDLTp$T6c!w(m&l854)(2|&l;71^zO*|7YxKY zaJ=ahQA6h5-hcI$%$%fnh_XYW<98wT-mdXE*GKg%_-(}g8C;3I5U#{t2v=e+1lwf= zrK5Dp)~#At$_=kd&|k__nKi2QTm{imIpnH^QcY}Q@M5xi)LK}|t#?gq#2)xiwZ1KfGN&HWh;thF)n`36 f{E?#hA0d1KXreoq3>p`~00000NkvXXu0mjfq{8fQ delta 484 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 diff --git a/res/drawable-xxhdpi/overscroll_glow_left.9.png b/res/drawable-xxhdpi/overscroll_glow_left.9.png index e188ce8ac8bfc332e871d5ac628950d7f0aff737..1a895cdc883c37566240308eed2ab1c9b4e47539 100644 GIT binary patch literal 4562 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 literal 2800 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 NYD07&lvo`)@gJNe+z0>w diff --git a/res/values/config.xml b/res/values/config.xml index fa84b9bc6b..97408ccab7 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -71,7 +71,7 @@ 250 - 6500 + 8000 false diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index dcf10697ee..1425f7ff57 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -194,6 +194,7 @@ public class Workspace extends SmoothPagedView private final int[] mTempXY = new int[2]; private int[] mTempVisiblePagesRange = new int[2]; private boolean mOverscrollTransformsSet; + private float mLastOverscrollPivotX; public static final int DRAG_BITMAP_PADDING = 2; private boolean mWorkspaceFadeInAdjacentScreens; @@ -1413,22 +1414,20 @@ public class Workspace extends SmoothPagedView final float rightBiasedPivot = 0.75f; final int lowerIndex = 0; final int upperIndex = getChildCount() - 1; - if (isRtl) { - index = mOverScrollX < 0 ? upperIndex : lowerIndex; - pivotX = (index == 0 ? leftBiasedPivot : rightBiasedPivot); - } else { - index = mOverScrollX < 0 ? lowerIndex : upperIndex; - pivotX = (index == 0 ? rightBiasedPivot : leftBiasedPivot); - } + + final boolean isLeftPage = mOverScrollX < 0; + index = (!isRtl && isLeftPage) || (isRtl && !isLeftPage) ? lowerIndex : upperIndex; + pivotX = isLeftPage ? rightBiasedPivot : leftBiasedPivot; CellLayout cl = (CellLayout) getChildAt(index); float scrollProgress = getScrollProgress(screenCenter, cl, index); - final boolean isLeftPage = (isRtl ? index > 0 : index == 0); cl.setOverScrollAmount(Math.abs(scrollProgress), isLeftPage); float rotation = -WORKSPACE_OVERSCROLL_ROTATION * scrollProgress; cl.setRotationY(rotation); - if (!mOverscrollTransformsSet) { + + if (!mOverscrollTransformsSet || Float.compare(mLastOverscrollPivotX, pivotX) != 0) { mOverscrollTransformsSet = true; + mLastOverscrollPivotX = pivotX; cl.setCameraDistance(mDensity * mCameraDistance); cl.setPivotX(cl.getMeasuredWidth() * pivotX); cl.setPivotY(cl.getMeasuredHeight() * 0.5f);