Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose

This commit is contained in:
Adam Cohen
2013-09-30 19:01:10 +00:00
committed by Android (Google) Code Review

View File

@@ -1024,6 +1024,12 @@ public class Workspace extends SmoothPagedView
stripEmptyScreens();
mStripScreensOnPageStopMoving = false;
}
}
@Override
protected void notifyPageSwitchListener() {
super.notifyPageSwitchListener();
Launcher.setScreen(mCurrentPage);
if (hasCustomContent() && getNextPage() == 0 && !mCustomContentShowing) {
mCustomContentShowing = true;
@@ -1040,12 +1046,6 @@ public class Workspace extends SmoothPagedView
mLauncher.setVoiceButtonProxyVisible(true);
}
}
}
@Override
protected void notifyPageSwitchListener() {
super.notifyPageSwitchListener();
Launcher.setScreen(mCurrentPage);
};
protected void setWallpaperDimension() {