Small optimizations for the All Apps transition
- don't set properties in animations if they don't
change
- don't recalculate visible pages on every frame
- don't require scroll indicator to be an
ImageView
Change-Id: I099b29e677da2d0e401f677d47cdb8b5df51224e
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 8aae809..e27345b 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -916,8 +916,10 @@
}
public void setBackgroundAlpha(float alpha) {
- mBackgroundAlpha = alpha;
- invalidate();
+ if (mBackgroundAlpha != alpha) {
+ mBackgroundAlpha = alpha;
+ invalidate();
+ }
}
// Need to return true to let the view system know we know how to handle alpha-- this is
@@ -928,6 +930,7 @@
return true;
}
+ @Override
public void setAlpha(float alpha) {
setChildrenAlpha(alpha);
super.setAlpha(alpha);
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 975686e..b6efcfa 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -181,7 +181,7 @@
// Scrolling indicator
private ValueAnimator mScrollIndicatorAnimator;
- private ImageView mScrollIndicator;
+ private View mScrollIndicator;
private int mScrollIndicatorPaddingLeft;
private int mScrollIndicatorPaddingRight;
private boolean mHasScrollIndicator = true;
@@ -726,19 +726,18 @@
protected void getVisiblePages(int[] range) {
final int pageCount = getChildCount();
if (pageCount > 0) {
- final int pageWidth = getScaledMeasuredWidth(getPageAt(0));
final int screenWidth = getMeasuredWidth();
- int x = getScaledRelativeChildOffset(0) + pageWidth;
+ int x = (int) getPageAt(0).getRight();
int leftScreen = 0;
int rightScreen = 0;
while (x <= mScrollX && leftScreen < pageCount - 1) {
leftScreen++;
- x += getScaledMeasuredWidth(getPageAt(leftScreen)) + mPageSpacing;
+ x = getPageAt(leftScreen).getRight();
}
rightScreen = leftScreen;
while (x < mScrollX + screenWidth && rightScreen < pageCount - 1) {
rightScreen++;
- x += getScaledMeasuredWidth(getPageAt(rightScreen)) + mPageSpacing;
+ x = (int) getPageAt(rightScreen).getRight();
}
range[0] = leftScreen;
range[1] = rightScreen;
@@ -1756,12 +1755,12 @@
}
}
- protected ImageView getScrollingIndicator() {
+ protected View getScrollingIndicator() {
// We use mHasScrollIndicator to prevent future lookups if there is no sibling indicator
// found
if (mHasScrollIndicator && mScrollIndicator == null) {
ViewGroup parent = (ViewGroup) getParent();
- mScrollIndicator = (ImageView) (parent.findViewById(R.id.paged_view_indicator));
+ mScrollIndicator = (View) (parent.findViewById(R.id.paged_view_indicator));
mHasScrollIndicator = mScrollIndicator != null;
if (mHasScrollIndicator) {
mScrollIndicator.setVisibility(View.VISIBLE);
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 83408ba..b7852b3 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1725,6 +1725,9 @@
cl.setBackgroundAlphaMultiplier(a * mOldBackgroundAlphaMultipliers[i] +
b * mNewBackgroundAlphaMultipliers[i]);
cl.setFastAlpha(a * mOldAlphas[i] + b * mNewAlphas[i]);
+ if (mOldAlphas[i] != mNewAlphas[i]) {
+ cl.setAlpha(a * mOldAlphas[i] + b * mNewAlphas[i]);
+ }
}
}
syncChildrenLayersEnabledOnVisiblePages();
@@ -3518,7 +3521,7 @@
final ViewGroup parent = (ViewGroup) getParent();
final ImageView qsbDivider = (ImageView) (parent.findViewById(R.id.qsb_divider));
final ImageView dockDivider = (ImageView) (parent.findViewById(R.id.dock_divider));
- final ImageView scrollIndicator = getScrollingIndicator();
+ final View scrollIndicator = getScrollingIndicator();
cancelScrollingIndicatorAnimations();
if (qsbDivider != null) qsbDivider.setAlpha(reducedFade);