diff options
| author | Winson Chung <winsonc@google.com> | 2015-07-31 20:09:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 20:09:03 +0000 |
| commit | 2285b30003cad0c3062fc2831b215b764bed44f7 (patch) | |
| tree | 9658a583dfe8c24934db14759c1ad00ab2f4c060 /src/com/android/launcher3/CellLayout.java | |
| parent | c1729a4d154f28c32175823e0cb9448a9c58a4e4 (diff) | |
| parent | ec70312dea4083416d2d132ea8853455b0dec616 (diff) | |
| download | android_packages_apps_Trebuchet-2285b30003cad0c3062fc2831b215b764bed44f7.tar.gz android_packages_apps_Trebuchet-2285b30003cad0c3062fc2831b215b764bed44f7.tar.bz2 android_packages_apps_Trebuchet-2285b30003cad0c3062fc2831b215b764bed44f7.zip | |
am ec70312d: Merge "Fixing issue with flash during overview transition." into ub-launcher3-burnaby
* commit 'ec70312dea4083416d2d132ea8853455b0dec616':
Fixing issue with flash during overview transition.
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -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 31e2a7f56..cad1a4fe9 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -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(); } |