commit 6521be4f9272d12f907108d871a79852ce9e6183
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:37:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:37:55 2014 +0000
tree 04864744d49eddce54603ae764959447cc5bd47f
parent 1a3a5b0c67c0ed596efe56a9df9477a983dccc39
parent 2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a

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

* commit '2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a':
  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();
         }
     }