Merge "Fixing issue with flash during overview transition." into ub-launcher3-burnaby

This commit is contained in:
Winson Chung
2015-07-31 20:04:08 +00:00
committed by Android (Google) Code Review

View File

@@ -211,6 +211,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
mBackground = (TransitionDrawable) res.getDrawable(R.drawable.bg_screenpanel);
mBackground.setCallback(this);
mBackground.setAlpha((int) (mBackgroundAlpha * 255));
mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE *
grid.iconSizePx);
@@ -414,7 +415,11 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
if (mIsDragOverlapping) {
mBackground.startTransition(BACKGROUND_ACTIVATE_DURATION);
} else {
mBackground.reverseTransition(BACKGROUND_ACTIVATE_DURATION);
if (mBackgroundAlpha > 0f) {
mBackground.reverseTransition(BACKGROUND_ACTIVATE_DURATION);
} else {
mBackground.resetTransition();
}
}
invalidate();
}