diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-15 10:22:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-15 10:22:04 -0800 |
| commit | 2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a (patch) | |
| tree | 7118ed278756cb9316460b5b5520d9cb9626ef31 /src/com | |
| parent | 1aca70a5361857bb41ea1e1af0859ca60cf1dbd6 (diff) | |
| parent | 202e4fdafb5e4e94dd925905c1553bd92e61985e (diff) | |
| download | android_packages_apps_Trebuchet-2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a.tar.gz android_packages_apps_Trebuchet-2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a.tar.bz2 android_packages_apps_Trebuchet-2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a.zip | |
am 202e4fda: Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf
* commit '202e4fdafb5e4e94dd925905c1553bd92e61985e':
Fix for transparent CustomContent screen (issue 11549096)
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
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(); } } |