commit 4b2a752f26368f2c532f42a24b6ca1df78a680d2
author Adam Cohen <adamcohen@google.com> Fri Feb 14 21:01:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 21:01:45 2014 +0000
tree 0dd09e915b6011e791a45532aa2bee390c1feef8
parent 151b5f585cd39318828fbbde986da1bfa0418041
parent 7c79e5dc819b08f544a53f7f300c033280755c7f

am 7c79e5dc: am 6521be4f: am 2dc25b18: am 202e4fda: Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf

* commit '7c79e5dc819b08f544a53f7f300c033280755c7f':
  Fix for transparent CustomContent screen (issue 11549096)

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8ef0ff2..7466a19 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2336,7 +2336,9 @@
     void hideCustomContentIfNecessary() {
         boolean hide  = mState != Workspace.State.NORMAL;
         if (hide && hasCustomContent()) {
+            disableLayoutTransitions();
             mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
+            enableLayoutTransitions();
         }
     }