commit 2285b30003cad0c3062fc2831b215b764bed44f7
author Winson Chung <winsonc@google.com> Fri Jul 31 20:09:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 31 20:09:03 2015 +0000
tree 9658a583dfe8c24934db14759c1ad00ab2f4c060
parent c1729a4d154f28c32175823e0cb9448a9c58a4e4
parent ec70312dea4083416d2d132ea8853455b0dec616

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

* commit 'ec70312dea4083416d2d132ea8853455b0dec616':
  Fixing issue with flash during overview transition.

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 31e2a7f..cad1a4f 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -213,6 +213,7 @@
 
         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 @@
             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();
         }