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)
This commit is contained in:
Adam Cohen
2014-02-14 20:37:55 +00:00
committed by Android Git Automerger
+2
View File
@@ -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();
}
}