commit def01fb8dc7da0d8287603ed5694ebe028640dcb
author Adam Cohen <adamcohen@google.com> Mon Sep 30 19:01:10 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 30 19:01:10 2013 +0000
tree 3d3937a2e4b5fe7164ba403ddfd6dd8f0f025584
parent 0655904abd2e67f3c4c5b9e8e57cee6f8f562076
parent 89cbbb9d2e6885f176d59d8e7476a4001fe6e7f5

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

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index baddc2d..132f42d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1024,6 +1024,12 @@
             stripEmptyScreens();
             mStripScreensOnPageStopMoving = false;
         }
+    }
+
+    @Override
+    protected void notifyPageSwitchListener() {
+        super.notifyPageSwitchListener();
+        Launcher.setScreen(mCurrentPage);
 
         if (hasCustomContent() && getNextPage() == 0 && !mCustomContentShowing) {
             mCustomContentShowing = true;
@@ -1040,12 +1046,6 @@
                 mLauncher.setVoiceButtonProxyVisible(true);
             }
         }
-    }
-
-    @Override
-    protected void notifyPageSwitchListener() {
-        super.notifyPageSwitchListener();
-        Launcher.setScreen(mCurrentPage);
     };
 
     protected void setWallpaperDimension() {