am 2456b973: Merge "Fix issue where custom content pops in (issue 11209357)" into jb-ub-now-indigo-rose

* commit '2456b9738803b5f4314b6747dd7eea116d03eb3d':
  Fix issue where custom content pops in (issue 11209357)
This commit is contained in:
Adam Cohen
2013-10-14 16:45:42 -07:00
committed by Android Git Automerger
+6
View File
@@ -1446,6 +1446,12 @@ public class Workspace extends SmoothPagedView
}
if (Float.compare(progress, mLastCustomContentScrollProgress) == 0) return;
CellLayout cc = mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID);
if (progress > 0 && cc.getVisibility() != VISIBLE && !isSmall()) {
cc.setVisibility(VISIBLE);
}
mLastCustomContentScrollProgress = progress;
setBackgroundAlpha(progress * 0.8f);