commit 202e4fdafb5e4e94dd925905c1553bd92e61985e
author Adam Cohen <adamcohen@google.com> Fri Nov 15 13:21:04 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 15 13:21:05 2013 +0000
tree f5fc3e41865f2704efc064b9de4f15604dc4ae77
parent b427f30e4da1141ec0266cfad8cbfb63a1760bc6
parent 1774a8a0c67ae225b31dfb37213d6cadc630e48c

Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf

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();
         }
     }