PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove use of setFast* properties"

Browse Source
This commit is contained in:
Michael Jurka
2012-01-17 10:57:54 -08:00
committed by Android (Google) Code Review
parent 86868057c2 7372c59277
commit fbf0dfc523
3 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/CellLayout.java
-16
View File
@@ -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);
}
src/com/android/launcher2/PagedView.java
+1 -2
View File
@@ -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();
src/com/android/launcher2/Workspace.java
+12 -14
View File
@@ -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(