From bdf78559f223ac11e01e3311edd5a48a80383e1e Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Mon, 31 Oct 2011 14:34:25 -0700 Subject: [PATCH] Fix stuttering animation when you press home Bug # 5533287 also removing some dead code/assets Change-Id: I05e0a67d5b9003c76e1589a9dc54b7d17b755acf --- ...lue.9.png => flying_icon_bg_pressed.9.png} | Bin .../homescreen_small_blue_strong.9.png | Bin 1942 -> 0 bytes ...lue.9.png => flying_icon_bg_pressed.9.png} | Bin .../homescreen_small_blue_strong.9.png | Bin 1647 -> 0 bytes ...lue.9.png => flying_icon_bg_pressed.9.png} | Bin .../homescreen_small_blue_strong.9.png | Bin 7127 -> 0 bytes res/drawable/flying_icon_bg.xml | 2 +- src/com/android/launcher2/CellLayout.java | 73 +----------------- src/com/android/launcher2/Workspace.java | 5 +- 9 files changed, 6 insertions(+), 74 deletions(-) rename res/drawable-hdpi/{homescreen_small_blue.9.png => flying_icon_bg_pressed.9.png} (100%) delete mode 100644 res/drawable-hdpi/homescreen_small_blue_strong.9.png rename res/drawable-mdpi/{homescreen_small_blue.9.png => flying_icon_bg_pressed.9.png} (100%) delete mode 100644 res/drawable-mdpi/homescreen_small_blue_strong.9.png rename res/drawable-xhdpi/{homescreen_small_blue.9.png => flying_icon_bg_pressed.9.png} (100%) delete mode 100644 res/drawable-xhdpi/homescreen_small_blue_strong.9.png diff --git a/res/drawable-hdpi/homescreen_small_blue.9.png b/res/drawable-hdpi/flying_icon_bg_pressed.9.png similarity index 100% rename from res/drawable-hdpi/homescreen_small_blue.9.png rename to res/drawable-hdpi/flying_icon_bg_pressed.9.png diff --git a/res/drawable-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-hdpi/homescreen_small_blue_strong.9.png deleted file mode 100644 index 6eab8f2659e77b16f6ca4527f959095178263262..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1942 zcmYjSdpr}28Xktl7jg-?wwYT@A>Wv}%$Cnbl*nz&EhCq($R!G4NLne$CAY(=R>{QT z$7q?!gs+kqmXX9XG6y@;QD5hG&L8jl{`bDm`#jI@_Y|CPcit;=Kn4H+>~;AA?YTSs zeiTS*w|mPHp8x>Tfi7rAuapU1U@XzgTg`4|d6|ruUooy#CYIi^FU(Zllc&7?uufO+ zkF!R`*pqbAgw-&WqdrqD$4vwKyk!)B0}FMxp{Er{H1R`&bs%GV@cGH4WUF>$)k4>T zHNhEQCy%dGpOKKCMpl2TUdY&B6Q=*gVs|pUe4c9iw?>ZEVT$&f`v2)`lgIG3^a@wm z`idqW%0}nbsL^D$q00M}=a!H+?Ks7dZ`yy&a*S zVu@%?X*~^MHd*t53!2}(SWhnY4qB#jqobX4rRrSGl_aa^H>ZYuWNq@BY}}Mg27?0B z=lG=$HjZ$| z=<|W{`JFDV`1xWMY>!OI(L?+KD#o_g+F+-Yqk56GRbg1g+**n^w@MG7yZPEB=0MUP z)vfnLyg0ob}>am0r7I)P=hubD;$2nHbaogeNW@1o;(*~~Xb`P0nl**Sp zjhC6!M-GOHDUFcylHj4w^%1;#MZl&0+ty^27_}vE5?W@SZ%b=R0Ph9NF_&z=Lp&LM8C zc9;rrlun#xTp*VWh+25rbeX{ayvf^ecDyHocDbIW}7<^kZcq771R!rz$`HfKNCDy;Fi}wI09!lp#jl`w;-> zf78i};=Jlg9tkn5u@4>*egCR0A&1|ANJUCp<%qgc)%0}YAs+GimkMk?t6prN@sY4K zjEmbE#(j(b2pWD2l%z)JxK7lN8AH6@54Q+;G6V{G=9j;(g#1uLs*;O;G9H$HdA(Y9 zy@#fJ0gw?TZ52i9p}vr2GnFa_a4!(syF8j*9IoQrXTCE`1nVb8!y|jG9ZLJ29b_)J z7i(26LE}8WhPTZh6*^O-Gn2oUiRrp4#o^#xgF9o?H#=Vv9y}ec26|>}pf$;5R^7<$ zzvN>6vSZ9rO*3QccXU&;Ew)@=plBS3sJMmZWnyHM!-U6&bbM(sV$^|dQAdNd=1kUR zUmcCOtHk{cP9$2*lMA-GDmdJU;t!7u6jc^a)!{Lmz>V{CxeFCG#G0;pXCU$ey)pgs zO;CT6^hQW0r<{7LI z%F4Q9@2h(=7Ou2Qr<&&`MW4#+g+MJF&!UKSG4OKqSpDDd8r#iK3lT~B{6!y<*#(lQ zAF;V!OJ$DUWt;6GvLB4EW?07mc^d>0BijhFh>|97_PJ{KW?>CaWcrEJo-Qd*6QHzx zORQo_x?3eGrhgD=_eH_(1~B0`Oy7Lh04mUyNi-_06QSA(Zk=W5MH}F?(5YYQwX*Z4 zQ>NLSBJ18M4WEk6F|smi#h)boUts#Y&Zlq~{K_46!mgiSB<5+%<3v)4kRUto5}+pw zq5ukj&3WR~p@Ry5(Ky^&BWlzNWJptE%&H+7#C!C$1<$8JS78&rD(^FYyWiMOmSaA@4@P}n@xpe zu_NeO867TZdDU4q1Q>|sm#MB!1@o)&;(R>wHuvNX5F6ha zCl(XQ&Q)oVIEGWYX!Cv=W=!5wa7b*sOIF2?*7y$`{O!4<2h43KUuIL0YWKQk`0Cqh z%x$8di}sN>`A|W@TYqIgonW(7iREo$sf-y6k4S#fZ$w{8SjTv5TRl3f>WAz0$t(N1 z7_BD=ta=7X{3!6l@d83?1<>8&&x)|vcoAJpW!-heKC2cS{VU6ML(P-a7Xb>TYwA39sL*;oc$l+iM6Ew diff --git a/res/drawable-mdpi/homescreen_small_blue.9.png b/res/drawable-mdpi/flying_icon_bg_pressed.9.png similarity index 100% rename from res/drawable-mdpi/homescreen_small_blue.9.png rename to res/drawable-mdpi/flying_icon_bg_pressed.9.png diff --git a/res/drawable-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-mdpi/homescreen_small_blue_strong.9.png deleted file mode 100644 index 79d84a4377a132fbd960ff497e2e8559dc3fc6c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1647 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 N002ovPDHLkV1gde_-_CJ diff --git a/res/drawable/flying_icon_bg.xml b/res/drawable/flying_icon_bg.xml index 6f5bf0bca0..167c3ba272 100644 --- a/res/drawable/flying_icon_bg.xml +++ b/res/drawable/flying_icon_bg.xml @@ -15,6 +15,6 @@ --> - + diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 54fdcc53cd..9ffc1d0e11 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -96,12 +96,7 @@ public class CellLayout extends ViewGroup { private float mBackgroundAlphaMultiplier = 1.0f; private Drawable mNormalBackground; - private Drawable mActiveBackground; private Drawable mActiveGlowBackground; - private Drawable mNormalBackgroundMini; - private Drawable mNormalGlowBackgroundMini; - private Drawable mActiveBackgroundMini; - private Drawable mActiveGlowBackgroundMini; private Drawable mOverScrollForegroundDrawable; private Drawable mOverScrollLeft; private Drawable mOverScrollRight; @@ -112,11 +107,8 @@ public class CellLayout extends ViewGroup { private float mGlowBackgroundAlpha; private int mForegroundPadding; - private boolean mAcceptsDrops = true; // If we're actively dragging something over this screen, mIsDragOverlapping is true private boolean mIsDragOverlapping = false; - private boolean mIsDragOccuring = false; - private boolean mIsDefaultDropTarget = false; private final Point mDragCenter = new Point(); // These arrays are used to implement the drag visualization on x-large screens. @@ -182,25 +174,15 @@ public class CellLayout extends ViewGroup { final Resources res = getResources(); mNormalBackground = res.getDrawable(R.drawable.homescreen_blue_normal_holo); - mActiveBackground = res.getDrawable(R.drawable.homescreen_blue_strong_holo); mActiveGlowBackground = res.getDrawable(R.drawable.homescreen_blue_strong_holo); - mNormalBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue); - mNormalGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue_strong); - mActiveBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue_strong); - mActiveGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue_strong); mOverScrollLeft = res.getDrawable(R.drawable.overscroll_glow_left); mOverScrollRight = res.getDrawable(R.drawable.overscroll_glow_right); mForegroundPadding = res.getDimensionPixelSize(R.dimen.workspace_overscroll_drawable_padding); mNormalBackground.setFilterBitmap(true); - mActiveBackground.setFilterBitmap(true); mActiveGlowBackground.setFilterBitmap(true); - mNormalBackgroundMini.setFilterBitmap(true); - mNormalGlowBackgroundMini.setFilterBitmap(true); - mActiveBackgroundMini.setFilterBitmap(true); - mActiveGlowBackgroundMini.setFilterBitmap(true); // Initialize the data structures used for the drag visualization. @@ -358,20 +340,6 @@ public class CellLayout extends ViewGroup { return null; } - public void setIsDefaultDropTarget(boolean isDefaultDropTarget) { - if (mIsDefaultDropTarget != isDefaultDropTarget) { - mIsDefaultDropTarget = isDefaultDropTarget; - invalidate(); - } - } - - void setIsDragOccuring(boolean isDragOccuring) { - if (mIsDragOccuring != isDragOccuring) { - mIsDragOccuring = isDragOccuring; - invalidate(); - } - } - void setIsDragOverlapping(boolean isDragOverlapping) { if (mIsDragOverlapping != isDragOverlapping) { mIsDragOverlapping = isDragOverlapping; @@ -454,47 +422,17 @@ public class CellLayout extends ViewGroup { // backgrounds if (mBackgroundAlpha > 0.0f) { Drawable bg; - boolean mini = getScaleX() < 0.5f; if (mIsDragOverlapping) { // In the mini case, we draw the active_glow bg *over* the active background - bg = mini ? mActiveBackgroundMini : mActiveGlowBackground; - } else if (mIsDragOccuring && mAcceptsDrops) { - bg = mini ? mActiveBackgroundMini : mActiveBackground; - } else if (mIsDefaultDropTarget && mini) { - bg = mNormalGlowBackgroundMini; + bg = mActiveGlowBackground; } else { - bg = mini ? mNormalBackgroundMini : mNormalBackground; + bg = mNormalBackground; } bg.setAlpha((int) (mBackgroundAlpha * mBackgroundAlphaMultiplier * 255)); bg.setBounds(mBackgroundRect); bg.draw(canvas); - - if (mini && mIsDragOverlapping) { - boolean modifiedClipRect = false; - if (mGlowBackgroundScale > 1.0f) { - // If the hover background's scale is greater than 1, we'll be drawing outside - // the bounds of this CellLayout. Get around that by temporarily increasing the - // size of the clip rect - float marginFraction = (mGlowBackgroundScale - 1.0f) / 2.0f; - Rect clipRect = canvas.getClipBounds(); - int marginX = (int) (marginFraction * (clipRect.right - clipRect.left)); - int marginY = (int) (marginFraction * (clipRect.bottom - clipRect.top)); - canvas.save(Canvas.CLIP_SAVE_FLAG); - canvas.clipRect(-marginX, -marginY, - getWidth() + marginX, getHeight() + marginY, Region.Op.REPLACE); - modifiedClipRect = true; - } - - mActiveGlowBackgroundMini.setAlpha( - (int) (mBackgroundAlpha * mGlowBackgroundAlpha * 255)); - mActiveGlowBackgroundMini.setBounds(mGlowBackgroundRect); - mActiveGlowBackgroundMini.draw(canvas); - if (modifiedClipRect) { - canvas.restore(); - } - } } if (mCrosshairsVisibility > 0.0f) { @@ -691,13 +629,6 @@ public class CellLayout extends ViewGroup { return false; } - public void setAcceptsDrops(boolean acceptsDrops) { - if (mAcceptsDrops != acceptsDrops) { - mAcceptsDrops = acceptsDrops; - invalidate(); - } - } - @Override public void removeAllViews() { clearOccupiedCells(); diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 0c297dd824..059a3df1da 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1525,6 +1525,9 @@ public class Workspace extends SmoothPagedView } void changeState(final State state, boolean animated, int delay) { + if (mState == state) { + return; + } if (mFirstLayout) { // (mFirstLayout == "first layout has not happened yet") // cancel any pending shrinks that were set earlier @@ -2390,7 +2393,6 @@ public class Workspace extends SmoothPagedView // Show the current page outlines to indicate that we can accept this drop showOutlines(); - layout.setIsDragOccuring(true); layout.onDragEnter(); layout.visualizeDropLocation(null, mDragOutline, x, y, 1, 1, null, null); @@ -2451,7 +2453,6 @@ public class Workspace extends SmoothPagedView } case DragEvent.ACTION_DRAG_ENDED: // Hide the page outlines after the drop - layout.setIsDragOccuring(false); layout.onDragExit(); hideOutlines(); return true;