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

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

Browse Source 
* commit 'ec70312dea4083416d2d132ea8853455b0dec616':
  Fixing issue with flash during overview transition.
This commit is contained in:
Winson Chung
2015-07-31 20:09:03 +00:00
committed by Android Git Automerger
parent c1729a4d15 ec70312dea
commit 2285b30003
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/CellLayout.java
+6 -1
View File
@@ -213,6 +213,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);
@@ -416,7 +417,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();
}