diff options
| author | Winson Chung <winsonc@google.com> | 2015-07-31 20:04:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 20:04:08 +0000 |
| commit | ec70312dea4083416d2d132ea8853455b0dec616 (patch) | |
| tree | 924a032731bd5d8f17946a551c2ec60c03847341 | |
| parent | e5bb705fb79f18df8680958dcf2c5460e16c90b6 (diff) | |
| parent | e8f1d047b1b788bc9884be2417e7aa0cec7e8ae8 (diff) | |
| download | android_packages_apps_Trebuchet-ec70312dea4083416d2d132ea8853455b0dec616.tar.gz android_packages_apps_Trebuchet-ec70312dea4083416d2d132ea8853455b0dec616.tar.bz2 android_packages_apps_Trebuchet-ec70312dea4083416d2d132ea8853455b0dec616.zip | |
Merge "Fixing issue with flash during overview transition." into ub-launcher3-burnaby
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 809688712..b875d22e6 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -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(); } |