diff options
author | Michael Jurka <mikejurka@google.com> | 2012-01-16 04:21:35 -0800 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2012-01-16 04:21:35 -0800 |
commit | 7372c59277a23a31eeb1513a554b29d7bf05aedb (patch) | |
tree | 6b0ef9f9ed7cec45f7cf8ead72395716c7a01c61 /src/com/android/launcher2 | |
parent | e3517d01ecb844b498d5862df07bc2177861806a (diff) | |
download | android_packages_apps_Trebuchet-7372c59277a23a31eeb1513a554b29d7bf05aedb.tar.gz android_packages_apps_Trebuchet-7372c59277a23a31eeb1513a554b29d7bf05aedb.tar.bz2 android_packages_apps_Trebuchet-7372c59277a23a31eeb1513a554b29d7bf05aedb.zip |
Remove use of setFast* properties
Change-Id: Ibfae0eed65d384789929829d6a24379561934eb4
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/CellLayout.java | 16 | ||||
-rw-r--r-- | src/com/android/launcher2/PagedView.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 26 |
3 files changed, 13 insertions, 32 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index e27345bfe..5df271ec9 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -903,10 +903,6 @@ public class CellLayout extends ViewGroup { return mBackgroundAlpha; } - public void setFastBackgroundAlpha(float alpha) { - mBackgroundAlpha = alpha; - } - public void setBackgroundAlphaMultiplier(float multiplier) { mBackgroundAlphaMultiplier = multiplier; } @@ -936,11 +932,6 @@ public class CellLayout extends ViewGroup { super.setAlpha(alpha); } - public void setFastAlpha(float alpha) { - setFastChildrenAlpha(alpha); - super.setFastAlpha(alpha); - } - private void setChildrenAlpha(float alpha) { final int childCount = getChildCount(); for (int i = 0; i < childCount; i++) { @@ -948,13 +939,6 @@ public class CellLayout extends ViewGroup { } } - private void setFastChildrenAlpha(float alpha) { - final int childCount = getChildCount(); - for (int i = 0; i < childCount; i++) { - getChildAt(i).setFastAlpha(alpha); - } - } - public View getChildAt(int x, int y) { return mChildren.getChildAt(x, y); } diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index c72fdccd8..939b7fdbe 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -624,8 +624,7 @@ public abstract class PagedView extends ViewGroup { if (child != null) { float scrollProgress = getScrollProgress(screenCenter, child, i); float alpha = 1 - Math.abs(scrollProgress); - child.setFastAlpha(alpha); - child.fastInvalidate(); + child.setAlpha(alpha); } } invalidate(); diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 7d61f6200..74ab60737 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -854,7 +854,7 @@ public class Workspace extends SmoothPagedView } } if (keepUpdating) { - fastInvalidate(); + invalidate(); } } @@ -1166,13 +1166,12 @@ public class Workspace extends SmoothPagedView backgroundAlphaInterpolator(Math.abs(scrollProgress))); } } - cl.setFastTranslationX(translationX); - cl.setFastRotationY(rotation); + cl.setTranslationX(translationX); + cl.setRotationY(rotation); if (mFadeInAdjacentScreens && !isSmall()) { float alpha = 1 - Math.abs(scrollProgress); - cl.setFastAlpha(alpha); + cl.setAlpha(alpha); } - cl.fastInvalidate(); } } if (!isSwitchingState() && !isInOverscroll) { @@ -1652,16 +1651,15 @@ public class Workspace extends SmoothPagedView for (int index = 0; index < getChildCount(); index++) { final int i = index; final CellLayout cl = (CellLayout) getChildAt(i); - invalidate(); if (mOldAlphas[i] == 0 && mNewAlphas[i] == 0) { - cl.fastInvalidate(); - cl.setFastTranslationX(mNewTranslationXs[i]); - cl.setFastTranslationY(mNewTranslationYs[i]); - cl.setFastScaleX(mNewScaleXs[i]); - cl.setFastScaleY(mNewScaleYs[i]); - cl.setFastBackgroundAlpha(mNewBackgroundAlphas[i]); + cl.setTranslationX(mNewTranslationXs[i]); + cl.setTranslationY(mNewTranslationYs[i]); + cl.setScaleX(mNewScaleXs[i]); + cl.setScaleY(mNewScaleYs[i]); + cl.setBackgroundAlpha(mNewBackgroundAlphas[i]); cl.setBackgroundAlphaMultiplier(mNewBackgroundAlphaMultipliers[i]); - cl.setFastAlpha(mNewAlphas[i]); + cl.setAlpha(mNewAlphas[i]); + cl.setRotationY(mNewRotationYs[i]); } else { LauncherViewPropertyAnimator a = new LauncherViewPropertyAnimator(cl); a.translationX(mNewTranslationXs[i]) @@ -1692,7 +1690,7 @@ public class Workspace extends SmoothPagedView bgAnim.setInterpolator(mZoomInInterpolator); bgAnim.addUpdateListener(new LauncherAnimatorUpdateListener() { public void onAnimationUpdate(float a, float b) { - cl.setFastBackgroundAlpha( + cl.setBackgroundAlpha( a * mOldBackgroundAlphas[i] + b * mNewBackgroundAlphas[i]); cl.setBackgroundAlphaMultiplier( |