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

* commit 'a130ad32c38189531e2ee7ba2813921a346118fc':
  Trying to get onShow in all the right places

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() {