diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-09-30 19:01:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-30 19:01:10 +0000 |
| commit | def01fb8dc7da0d8287603ed5694ebe028640dcb (patch) | |
| tree | 3d3937a2e4b5fe7164ba403ddfd6dd8f0f025584 /src | |
| parent | 0655904abd2e67f3c4c5b9e8e57cee6f8f562076 (diff) | |
| parent | 89cbbb9d2e6885f176d59d8e7476a4001fe6e7f5 (diff) | |
| download | android_packages_apps_Trebuchet-def01fb8dc7da0d8287603ed5694ebe028640dcb.tar.gz android_packages_apps_Trebuchet-def01fb8dc7da0d8287603ed5694ebe028640dcb.tar.bz2 android_packages_apps_Trebuchet-def01fb8dc7da0d8287603ed5694ebe028640dcb.zip | |
Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index baddc2dab..132f42d5f 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -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() { |