am 2a5bc113: DO NOT MERGE

* commit '2a5bc113b49b79c49281d5f8d8c1421d663d2ee4':
  DO NOT MERGE
This commit is contained in:
Michael Jurka
2012-02-14 20:12:11 -08:00
committed by Android Git Automerger
+2 -1
View File
@@ -1724,7 +1724,7 @@ public class Workspace extends SmoothPagedView
invalidate(); invalidate();
for (int i = 0; i < getChildCount(); i++) { for (int i = 0; i < getChildCount(); i++) {
final CellLayout cl = (CellLayout) getChildAt(i); final CellLayout cl = (CellLayout) getChildAt(i);
cl.fastInvalidate(); cl.invalidate();
cl.setFastTranslationX(a * mOldTranslationXs[i] + b * mNewTranslationXs[i]); cl.setFastTranslationX(a * mOldTranslationXs[i] + b * mNewTranslationXs[i]);
cl.setFastTranslationY(a * mOldTranslationYs[i] + b * mNewTranslationYs[i]); cl.setFastTranslationY(a * mOldTranslationYs[i] + b * mNewTranslationYs[i]);
cl.setFastScaleX(a * mOldScaleXs[i] + b * mNewScaleXs[i]); cl.setFastScaleX(a * mOldScaleXs[i] + b * mNewScaleXs[i]);
@@ -1734,6 +1734,7 @@ public class Workspace extends SmoothPagedView
cl.setBackgroundAlphaMultiplier(a * mOldBackgroundAlphaMultipliers[i] + cl.setBackgroundAlphaMultiplier(a * mOldBackgroundAlphaMultipliers[i] +
b * mNewBackgroundAlphaMultipliers[i]); b * mNewBackgroundAlphaMultipliers[i]);
cl.setFastAlpha(a * mOldAlphas[i] + b * mNewAlphas[i]); cl.setFastAlpha(a * mOldAlphas[i] + b * mNewAlphas[i]);
cl.invalidate();
} }
syncChildrenLayersEnabledOnVisiblePages(); syncChildrenLayersEnabledOnVisiblePages();
} }