summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-11-15 13:21:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-15 13:21:05 +0000
commit202e4fdafb5e4e94dd925905c1553bd92e61985e (patch)
treef5fc3e41865f2704efc064b9de4f15604dc4ae77
parentb427f30e4da1141ec0266cfad8cbfb63a1760bc6 (diff)
parent1774a8a0c67ae225b31dfb37213d6cadc630e48c (diff)
downloadandroid_packages_apps_Trebuchet-202e4fdafb5e4e94dd925905c1553bd92e61985e.tar.gz
android_packages_apps_Trebuchet-202e4fdafb5e4e94dd925905c1553bd92e61985e.tar.bz2
android_packages_apps_Trebuchet-202e4fdafb5e4e94dd925905c1553bd92e61985e.zip
Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8ef0ff2df..7466a19bb 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2336,7 +2336,9 @@ public class Workspace extends SmoothPagedView
void hideCustomContentIfNecessary() {
boolean hide = mState != Workspace.State.NORMAL;
if (hide && hasCustomContent()) {
+ disableLayoutTransitions();
mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
+ enableLayoutTransitions();
}
}