am b3fff9d9: Merge "Cleanup some incorrect / noisey calls to CustomContentCallbacks#onShow / onHide" into ub-launcher3-burnaby

* commit 'b3fff9d98a3e3c886d4efa912d7ad6753dd7ec9c':
  Cleanup some incorrect / noisey calls to CustomContentCallbacks#onShow / onHide
This commit is contained in:
Adam Cohen authored and Android Git Automerger committed 2015-09-21 17:40:50 +00:00
commit 9ae42fff6f
2 files changed
+16 -3

No files matched your search

+1 -1
View File
@@ -1610,7 +1610,7 @@ public class Workspace extends PagedView
}
public boolean isOnOrMovingToCustomContent() {
return hasCustomContent() && getNextPage() == 0;
return hasCustomContent() && getNextPage() == 0 && mRestorePage == INVALID_RESTORE_PAGE;
}
private void updateStateForCustomContent(int screenCenter) {